Skip to content

Commit 2da0169

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 120589 b: refs/heads/dist-snap c: 799ddba h: refs/heads/master i: 120587: c3f3be6 v: v3
1 parent f5d6770 commit 2da0169

File tree

366 files changed

+3453
-4647
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

366 files changed

+3453
-4647
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 1813e5aa1a03b0596b8de7abd1af31edf5d6098f
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 87ad19eb78239707f1ceed43e475c6aa052efdbc
9+
refs/heads/dist-snap: 799ddba8dac2e6b6a7dc6927a7cc0b5e785deecb
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

‎branches/dist-snap/CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
If you're just reporting a bug, please see:
44

5-
http://static.rust-lang.org/doc/master/complement-bugreport.html
5+
http://doc.rust-lang.org/complement-bugreport.html
66

77
## Pull request procedure
88

‎branches/dist-snap/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ documentation.
1313
> [getting started][wiki-start] notes on the wiki.
1414
1515
[installer]: http://www.rust-lang.org/install.html
16-
[tutorial]: http://static.rust-lang.org/doc/tutorial.html
16+
[tutorial]: http://doc.rust-lang.org/tutorial.html
1717
[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
1818
[win-wiki]: https://github.com/mozilla/rust/wiki/Using-Rust-on-Windows
1919

@@ -60,7 +60,7 @@ documentation.
6060

6161
[repo]: https://github.com/mozilla/rust
6262
[tarball]: http://static.rust-lang.org/dist/rust-nightly.tar.gz
63-
[tutorial]: http://static.rust-lang.org/doc/master/tutorial.html
63+
[tutorial]: http://doc.rust-lang.org/tutorial.html
6464

6565
## Notes
6666

‎branches/dist-snap/mk/docs.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ doc/footer.tex: $(D)/footer.inc | doc/
156156
# HTML (rustdoc)
157157
DOC_TARGETS += doc/not_found.html
158158
doc/not_found.html: $(D)/not_found.md $(HTML_DEPS) | doc/
159-
$(RUSTDOC) $(RUSTDOC_HTML_OPTS_NO_CSS) --markdown-css http://static.rust-lang.org/doc/master/rust.css $<
159+
$(RUSTDOC) $(RUSTDOC_HTML_OPTS_NO_CSS) --markdown-css http://doc.rust-lang.org/rust.css $<
160160

161161
define DEF_DOC
162162

‎branches/dist-snap/mk/target.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$(4): \
7474
$$(CRATE_FULLDEPS_$(1)_T_$(2)_H_$(3)_$(4)) \
7575
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
7676
| $$(TLIB$(1)_T_$(2)_H_$(3))/
77-
@$$(call E, rustc: $$(@D)/lib$(4))
77+
@$$(call E, oxidize: $$(@D)/lib$(4))
7878
$$(call REMOVE_ALL_OLD_GLOB_MATCHES,\
7979
$$(dir $$@)$$(call CFG_LIB_GLOB_$(2),$(4)))
8080
$$(call REMOVE_ALL_OLD_GLOB_MATCHES,\
@@ -114,7 +114,7 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/$(4)$$(X_$(2)): \
114114
$$(TLIB$(1)_T_$(2)_H_$(3))/stamp.$$(dep)) \
115115
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
116116
| $$(TBIN$(1)_T_$(4)_H_$(3))/
117-
@$$(call E, rustc: $$@)
117+
@$$(call E, oxidize: $$@)
118118
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --cfg $(4)
119119

120120
endef

‎branches/dist-snap/mk/tests.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ $(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): CFG_COMPILER_HOST_TRIPLE = $(2)
372372
$(3)/stage$(1)/test/$(4)test-$(2)$$(X_$(2)): \
373373
$$(CRATEFILE_$(4)) \
374374
$$(TESTDEP_$(1)_$(2)_$(3)_$(4))
375-
@$$(call E, rustc: $$@)
375+
@$$(call E, oxidize: $$@)
376376
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< --test \
377377
-L "$$(RT_OUTPUT_DIR_$(2))" \
378378
-L "$$(LLVM_LIBDIR_$(2))"

‎branches/dist-snap/src/compiletest/compiletest.rs

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ pub fn parse_config(args: Vec<StrBuf> ) -> Config {
9696
let args_ = args.tail();
9797
if args.get(1).as_slice() == "-h" || args.get(1).as_slice() == "--help" {
9898
let message = format!("Usage: {} [OPTIONS] [TESTNAME...]", argv0);
99-
println!("{}", getopts::usage(message.as_slice(), groups.as_slice()));
99+
println!("{}", getopts::usage(message, groups.as_slice()));
100100
println!("");
101101
fail!()
102102
}
@@ -109,7 +109,7 @@ pub fn parse_config(args: Vec<StrBuf> ) -> Config {
109109

110110
if matches.opt_present("h") || matches.opt_present("help") {
111111
let message = format!("Usage: {} [OPTIONS] [TESTNAME...]", argv0);
112-
println!("{}", getopts::usage(message.as_slice(), groups.as_slice()));
112+
println!("{}", getopts::usage(message, groups.as_slice()));
113113
println!("");
114114
fail!()
115115
}
@@ -323,15 +323,11 @@ pub fn is_test(config: &Config, testfile: &Path) -> bool {
323323
let mut valid = false;
324324

325325
for ext in valid_extensions.iter() {
326-
if name.ends_with(ext.as_slice()) {
327-
valid = true;
328-
}
326+
if name.ends_with(*ext) { valid = true; }
329327
}
330328

331329
for pre in invalid_prefixes.iter() {
332-
if name.starts_with(pre.as_slice()) {
333-
valid = false;
334-
}
330+
if name.starts_with(*pre) { valid = false; }
335331
}
336332

337333
return valid;

‎branches/dist-snap/src/compiletest/errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn load_errors(re: &Regex, testfile: &Path) -> Vec<ExpectedError> {
2424
let mut rdr = BufferedReader::new(File::open(testfile).unwrap());
2525

2626
rdr.lines().enumerate().filter_map(|(line_no, ln)| {
27-
parse_expected(line_no + 1, ln.unwrap().as_slice(), re)
27+
parse_expected(line_no + 1, ln.unwrap(), re)
2828
}).collect()
2929
}
3030

‎branches/dist-snap/src/compiletest/header.rs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -157,14 +157,9 @@ fn iter_header(testfile: &Path, it: |&str| -> bool) -> bool {
157157
// module or function. This doesn't seem to be an optimization
158158
// with a warm page cache. Maybe with a cold one.
159159
let ln = ln.unwrap();
160-
if ln.as_slice().starts_with("fn") ||
161-
ln.as_slice().starts_with("mod") {
160+
if ln.starts_with("fn") || ln.starts_with("mod") {
162161
return true;
163-
} else {
164-
if !(it(ln.as_slice().trim())) {
165-
return false;
166-
}
167-
}
162+
} else { if !(it(ln.trim())) { return false; } }
168163
}
169164
return true;
170165
}

‎branches/dist-snap/src/compiletest/procsrv.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ use std::unstable::dynamic_lib::DynamicLibrary;
1515

1616
fn target_env(lib_path: &str, prog: &str) -> Vec<(StrBuf, StrBuf)> {
1717
let prog = if cfg!(windows) {prog.slice_to(prog.len() - 4)} else {prog};
18-
let mut aux_path = prog.to_strbuf();
19-
aux_path.push_str(".libaux");
18+
let aux_path = prog + ".libaux";
2019

2120
// Need to be sure to put both the lib_path and the aux path in the dylib
2221
// search path for the child.

‎branches/dist-snap/src/compiletest/runtest.rs

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -351,10 +351,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
351351
cmds,
352352
"quit".to_strbuf()].connect("\n");
353353
debug!("script_str = {}", script_str);
354-
dump_output_file(config,
355-
testfile,
356-
script_str.as_slice(),
357-
"debugger.script");
354+
dump_output_file(config, testfile, script_str, "debugger.script");
358355

359356

360357
procsrv::run("",
@@ -462,10 +459,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
462459
"quit\n".to_strbuf()
463460
].connect("\n");
464461
debug!("script_str = {}", script_str);
465-
dump_output_file(config,
466-
testfile,
467-
script_str.as_slice(),
468-
"debugger.script");
462+
dump_output_file(config, testfile, script_str, "debugger.script");
469463

470464
// run debugger script with gdb
471465
#[cfg(windows)]
@@ -544,8 +538,7 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
544538

545539
// Set breakpoints on every line that contains the string "#break"
546540
for line in breakpoint_lines.iter() {
547-
script_str.push_str(format!("breakpoint set --line {}\n",
548-
line).as_slice());
541+
script_str.push_str(format!("breakpoint set --line {}\n", line));
549542
}
550543

551544
// Append the other commands
@@ -559,10 +552,7 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
559552

560553
// Write the script into a file
561554
debug!("script_str = {}", script_str);
562-
dump_output_file(config,
563-
testfile,
564-
script_str.as_slice(),
565-
"debugger.script");
555+
dump_output_file(config, testfile, script_str.into_owned(), "debugger.script");
566556
let debugger_script = make_out_name(config, testfile, "debugger.script");
567557

568558
// Let LLDB execute the script via lldb_batchmode.py
@@ -619,8 +609,8 @@ fn parse_debugger_commands(file_path: &Path, debugger_prefix: &str)
619609
-> DebuggerCommands {
620610
use std::io::{BufferedReader, File};
621611

622-
let command_directive = format!("{}-command", debugger_prefix);
623-
let check_directive = format!("{}-check", debugger_prefix);
612+
let command_directive = debugger_prefix + "-command";
613+
let check_directive = debugger_prefix + "-check";
624614

625615
let mut breakpoint_lines = vec!();
626616
let mut commands = vec!();
@@ -630,18 +620,18 @@ fn parse_debugger_commands(file_path: &Path, debugger_prefix: &str)
630620
for line in reader.lines() {
631621
match line {
632622
Ok(line) => {
633-
if line.as_slice().contains("#break") {
623+
if line.contains("#break") {
634624
breakpoint_lines.push(counter);
635625
}
636626

637627
header::parse_name_value_directive(
638-
line.as_slice(),
628+
line,
639629
command_directive.to_strbuf()).map(|cmd| {
640630
commands.push(cmd)
641631
});
642632

643633
header::parse_name_value_directive(
644-
line.as_slice(),
634+
line,
645635
check_directive.to_strbuf()).map(|cmd| {
646636
check_lines.push(cmd)
647637
});

‎branches/dist-snap/src/doc/complement-cheatsheet.md

Lines changed: 30 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
**Int to string**
66

7-
Use [`ToStr`](http://static.rust-lang.org/doc/master/std/to_str/trait.ToStr.html).
7+
Use [`ToStr`](../std/to_str/trait.ToStr.html).
88

99
~~~
1010
let x: int = 42;
@@ -13,7 +13,8 @@ let y: StrBuf = x.to_str().to_strbuf();
1313

1414
**String to int**
1515

16-
Use [`FromStr`](http://static.rust-lang.org/doc/master/std/from_str/trait.FromStr.html), and its helper function, [`from_str`](http://static.rust-lang.org/doc/master/std/from_str/fn.from_str.html).
16+
Use [`FromStr`](../std/from_str/trait.FromStr.html), and its helper function,
17+
[`from_str`](../std/from_str/fn.from_str.html).
1718

1819
~~~
1920
let x: Option<int> = from_str("42");
@@ -34,7 +35,8 @@ let y: StrBuf = format_strbuf!("{:X}", x); // uppercase hexadecimal
3435

3536
**String to int, in non-base-10**
3637

37-
Use [`FromStrRadix`](http://static.rust-lang.org/doc/master/std/num/trait.FromStrRadix.html), and its helper function, [`from_str_radix`](http://static.rust-lang.org/doc/master/std/num/fn.from_str_radix.html).
38+
Use [`FromStrRadix`](../std/num/trait.FromStrRadix.html), and its helper
39+
function, [`from_str_radix`](../std/num/fn.from_str_radix.html).
3840

3941
~~~
4042
use std::num;
@@ -45,7 +47,8 @@ let y: i64 = x.unwrap();
4547

4648
**Vector of Bytes to String**
4749

48-
To return a Borrowed String Slice (&str) use the str helper function [`from_utf8`](http://static.rust-lang.org/doc/master/std/str/fn.from_utf8.html).
50+
To return a Borrowed String Slice (&str) use the str helper function
51+
[`from_utf8`](../std/str/fn.from_utf8.html).
4952

5053
~~~
5154
use std::str;
@@ -55,17 +58,21 @@ let x: Option<&str> = str::from_utf8(bytes);
5558
let y: &str = x.unwrap();
5659
~~~
5760

58-
To return an Owned String (StrBuf) use the str helper function [`from_utf8_owned`](http://static.rust-lang.org/doc/master/std/str/fn.from_utf8_owned.html).
61+
To return an Owned String (StrBuf) use the str helper function
62+
[`from_utf8_owned`](../std/str/fn.from_utf8_owned.html).
5963

6064
~~~
6165
use std::str;
6266
63-
let x: Option<StrBuf> =
64-
str::from_utf8([ 104u8, 105u8 ]).map(|x| x.to_strbuf());
67+
let x: Result<StrBuf,~[u8]> =
68+
str::from_utf8_owned(~[104u8,105u8]).map(|x| x.to_strbuf());
6569
let y: StrBuf = x.unwrap();
6670
~~~
6771

68-
To return a [`MaybeOwned`](http://static.rust-lang.org/doc/master/std/str/enum.MaybeOwned.html) use the str helper function [`from_utf8_lossy`](http://static.rust-lang.org/doc/master/std/str/fn.from_utf8_owned.html). This function also replaces non-valid utf-8 sequences with U+FFFD replacement character.
72+
To return a [`MaybeOwned`](../std/str/enum.MaybeOwned.html) use the str helper
73+
function [`from_utf8_lossy`](../std/str/fn.from_utf8_owned.html).
74+
This function also replaces non-valid utf-8 sequences with U+FFFD replacement
75+
character.
6976

7077
~~~
7178
use std::str;
@@ -78,7 +85,13 @@ let y = str::from_utf8_lossy(x);
7885

7986
## How do I read from a file?
8087

81-
Use [`File::open`](http://static.rust-lang.org/doc/master/std/io/fs/struct.File.html#method.open) to create a [`File`](http://static.rust-lang.org/doc/master/std/io/fs/struct.File.html) struct, which implements the [`Reader`](http://static.rust-lang.org/doc/master/std/io/trait.Reader.html) trait.
88+
Use
89+
[`File::open`](../std/io/fs/struct.File.html#method.open)
90+
to create a
91+
[`File`](../std/io/fs/struct.File.html)
92+
struct, which implements the
93+
[`Reader`](../std/io/trait.Reader.html)
94+
trait.
8295

8396
~~~ {.ignore}
8497
use std::path::Path;
@@ -91,7 +104,7 @@ let reader : File = File::open(&path).unwrap_or_else(on_error);
91104

92105
## How do I iterate over the lines in a file?
93106

94-
Use the [`lines`](http://static.rust-lang.org/doc/master/std/io/trait.Buffer.html#method.lines) method on a [`BufferedReader`](http://static.rust-lang.org/doc/master/std/io/buffered/struct.BufferedReader.html).
107+
Use the [`lines`](../std/io/trait.Buffer.html#method.lines) method on a [`BufferedReader`](../std/io/buffered/struct.BufferedReader.html).
95108

96109
~~~
97110
use std::io::BufferedReader;
@@ -109,7 +122,7 @@ for line in reader.lines() {
109122

110123
## How do I search for a substring?
111124

112-
Use the [`find_str`](http://static.rust-lang.org/doc/master/std/str/trait.StrSlice.html#tymethod.find_str) method.
125+
Use the [`find_str`](../std/str/trait.StrSlice.html#tymethod.find_str) method.
113126

114127
~~~
115128
let str = "Hello, this is some random string";
@@ -120,7 +133,7 @@ let index: Option<uint> = str.find_str("rand");
120133

121134
## How do I get the length of a vector?
122135

123-
The [`Container`](http://static.rust-lang.org/doc/master/std/container/trait.Container.html) trait provides the `len` method.
136+
The [`Container`](../std/container/trait.Container.html) trait provides the `len` method.
124137

125138
~~~
126139
let u: ~[u32] = ~[0, 1, 2];
@@ -132,7 +145,7 @@ println!("u: {}, v: {}, w: {}", u.len(), v.len(), w.len()); // 3, 4, 5
132145

133146
## How do I iterate over a vector?
134147

135-
Use the [`iter`](http://static.rust-lang.org/doc/master/std/vec/trait.ImmutableVector.html#tymethod.iter) method.
148+
Use the [`iter`](../std/vec/trait.ImmutableVector.html#tymethod.iter) method.
136149

137150
~~~
138151
let values: ~[int] = ~[1, 2, 3, 4, 5];
@@ -141,7 +154,10 @@ for value in values.iter() { // value: &int
141154
}
142155
~~~
143156

144-
(See also [`mut_iter`](http://static.rust-lang.org/doc/master/std/vec/trait.MutableVector.html#tymethod.mut_iter) which yields `&mut int` and [`move_iter`](http://static.rust-lang.org/doc/master/std/vec/trait.OwnedVector.html#tymethod.move_iter) which yields `int` while consuming the `values` vector.)
157+
(See also [`mut_iter`](../std/vec/trait.MutableVector.html#tymethod.mut_iter)
158+
which yields `&mut int` and
159+
[`move_iter`](../std/vec/trait.OwnedVector.html#tymethod.move_iter) which yields
160+
`int` while consuming the `values` vector.)
145161

146162
# Type system
147163

‎branches/dist-snap/src/doc/guide-ffi.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,6 @@ are:
493493
* `rust-intrinsic`
494494
* `system`
495495
* `C`
496-
* `win64`
497496

498497
Most of the abis in this list are self-explanatory, but the `system` abi may
499498
seem a little odd. This constraint selects whatever the appropriate ABI is for

‎branches/dist-snap/src/doc/not_found.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ Some things that might be helpful to you though:
1313

1414
## Reference
1515
* [The Rust official site](http://rust-lang.org)
16-
* [The Rust reference manual](http://static.rust-lang.org/doc/master/rust.html) (* [PDF](http://static.rust-lang.org/doc/master/rust.pdf))
16+
* [The Rust reference manual](http://doc.rust-lang.org/rust.html) (* [PDF](http://doc.rust-lang.org/rust.pdf))
1717

1818
## Docs
19-
* [The standard library (stable)](http://doc.rust-lang.org/doc/0.10/std/index.html)
20-
* [The standard library (master)](http://doc.rust-lang.org/doc/master/std/index.html)
19+
* [The standard library](http://doc.rust-lang.org/std/)

‎branches/dist-snap/src/doc/rustdoc.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ documentation:
6767
~~~
6868
#[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
6969
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
70-
html_root_url = "http://static.rust-lang.org/doc/master")];
70+
html_root_url = "http://doc.rust-lang.org/")];
7171
~~~
7272

7373
The `html_root_url` is the prefix that rustdoc will apply to any references to

0 commit comments

Comments
 (0)