---

yaml
---
r: 166463
b: refs/heads/snap-stage3
c: f1a3ff0
h: refs/heads/master
i:
  166461: 23ce22b
  166459: 44bb51c
  166455: 7c1eb2c
  166447: 3ded816
  166431: fb814bd
  166399: 9385d70
v: v3

Author: Aatch

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 18842f89f084c52588fe7cffe07f87bf6e90796a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: e64a8193b02ce72ef183274994a25eae281cb89c
+refs/heads/snap-stage3: f1a3ff047e386d19238a880b42eb4edacbee0c1b
 refs/heads/try: f5d619caf9f32458680fae55526b99582ca682dd
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/AUTHORS.txt

@@ -498,7 +498,6 @@ Robert Irelan <[email protected]>
 Robert Knight <[email protected]>
 Robert Millar <[email protected]>
 Roland Tanglao <[email protected]>
-Rolf Timmermans <[email protected]>
 Ron Dahlgren <[email protected]>
 Roy Frostig <[email protected]>
 Russell <[email protected]>

branches/snap-stage3/man/rustc.1

@@ -12,54 +12,75 @@ This program is a compiler for the Rust language, available at
 .SH OPTIONS
 
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-Display the help message
+\fB\-\-crate-name NAME\fR
+Specify the name of the crate being built
+.TP
+\fB\-\-crate-type=[bin|lib|dylib|rlib|staticlib]\fR
+Configure the flavor of rust crate that is generated (default `bin`)
 .TP
 \fB\-\-cfg\fR SPEC
 Configure the compilation environment
 .TP
-\fB\-L\fR PATH
-Add a directory to the library search path
-.TP
-\fB\-l\fR NAME[:KIND]
-Link the generated crate(s) to the specified native library NAME. The optional
-KIND can be one of, static, dylib, or framework. If omitted, dylib is assumed.
+\fB\-\-emit=[asm,ir,bc,obj,link]\fR
+Configure the output that rustc will produce
 .TP
-\fB\-\-crate-type\fR [bin|lib|rlib|dylib|staticlib]
-Comma separated list of types of crates for the compiler to emit
+\fB\-h\fR, \fB\-\-help\fR
+Display this message
 .TP
-\fB\-\-crate-name NAME\fR
-Specify the name of the crate being built
+\fB\-L\fR PATH
+Add a directory to the library search path
 .TP
-\fB\-\-emit\fR [asm|llvm-bc|llvm-ir|obj|link|dep-info]
-Configure the output that rustc will produce
+\fB\-\-no\-trans\fR
+Run all passes except translation; no output
 .TP
-\fB\-\-print\fR [crate-name|output-file-names|sysroot]
-Comma separated list of compiler information to print on stdout
+\fB\-\-no\-analysis\fR
+Parse and expand the source, but run no analysis and produce no output
 .TP
 \fB\-g\fR
-Equivalent to \fI\-C\fR debuginfo=2
+Emit DWARF debug information into object files generated.
+.TP
+\fB\-\-debuginfo\fR LEVEL
+Emit DWARF debug info to the objects created: 0 = no debug info, 1 =
+line-tables only (for stacktraces and breakpoints), 2 = full debug
+info with variable and type information (same as -g).
 .TP
 \fB\-O\fR
-Equivalent to \fI\-C\fR opt-level=2
+Equivalent to \fI\-\-opt\-level=2\fR
 .TP
 \fB\-o\fR FILENAME
-Write output to <filename>. Ignored if multiple \fI\-\-emit\fR outputs are
-specified.
+Write output to <filename>. Ignored if more than one --emit is specified.
+.TP
+\fB\-\-opt\-level\fR LEVEL
+Optimize with possible levels 0-3
 .TP
 \fB\-\-out\-dir\fR DIR
-Write output to compiler-chosen filename in <dir>. Ignored if \fI\-o\fR is
-specified. Defaults to the current directory.
+Write output to compiler-chosen filename in <dir>. Ignored if -o is specified.
+(default the current directory)
+.TP
+\fB\-\-parse\-only\fR
+Parse only; do not compile, assemble, or link
 .TP
-\fB\-\-explain\fR OPT
-Provide a detailed explanation of an error message
+\fB\-\-pretty\fR [TYPE]
+Pretty-print the input instead of compiling; valid types are: normal
+(un-annotated source), expanded (crates expanded), typed (crates
+expanded, with type annotations), identified (fully parenthesized,
+AST nodes and blocks with IDs), or flowgraph=<nodeid> (graphviz
+formatted flowgraph for node)
+.TP
+\fB\-\-dep-info\fR [FILENAME]
+Output dependency info to <filename> after compiling, in a format suitable
+for use by Makefiles.
+.TP
+\fB\-\-sysroot\fR PATH
+Override the system root
 .TP
 \fB\-\-test\fR
 Build a test harness
 .TP
 \fB\-\-target\fR TRIPLE
-Target triple cpu-manufacturer-kernel[-os] to compile for (see chapter 3.4 of
-http://www.sourceware.org/autobook/ for details)
+Target triple cpu-manufacturer-kernel[-os] to compile for (see
+http://sources.redhat.com/autobook/autobook/autobook_17.html
+for details)
 .TP
 \fB\-W\fR help
 Print 'lint' options and default settings
@@ -76,30 +97,15 @@ Set lint denied
 \fB\-F\fR OPT, \fB\-\-forbid\fR OPT
 Set lint forbidden
 .TP
+\fB\-Z\fR FLAG
+Set internal debugging options. Use "-Z help" to print available options.
+.TP
 \fB\-C\fR FLAG[=VAL], \fB\-\-codegen\fR FLAG[=VAL]
 Set a codegen-related flag to the value specified. Use "-C help" to print
 available flags. See CODEGEN OPTIONS below
 .TP
-\fB\-V\fR, \fB\-\-version\fR
+\fB\-v\fR, \fB\-\-version\fR
 Print version info and exit
-.TP
-\fB\-v\fR, \fB\-\-verbose\fR
-Use verbose output
-.TP
-\fB\-\-extern\fR NAME=PATH
-Specify where an external rust library is located
-.TP
-\fB\-\-sysroot\fR PATH
-Override the system root
-.TP
-\fB\-Z\fR FLAG
-Set internal debugging options. Use "-Z help" to print available options.
-.TP
-\fB\-\-color\fR auto|always|never
-Configure coloring of output:
-    auto = colorize, if output goes to a tty (default);
-    always = always colorize output;
-    never = never colorize output
 
 .SH CODEGEN OPTIONS
 
@@ -115,9 +121,6 @@ objects.
 A space-separated list of extra arguments to pass to the linker when the linker
 is invoked.
 .TP
-\fBlto\fR
-Perform LLVM link-time optimizations.
-.TP
 \fBtarget-cpu\fR=help
 Selects a target processor. If the value is 'help', then a list of available
 CPUs is printed.
@@ -164,38 +167,8 @@ Prefers dynamic linking to static linking.
 \fBno-integrated-as\fR
 Force usage of an external assembler rather than LLVM's integrated one.
 .TP
-\fBno-redzone\fR
-Disable the use of the redzone.
-.TP
 \fBrelocation-model\fR=[pic,static,dynamic-no-pic]
-The relocation model to use. (Default: pic)
-.TP
-\fBcode-model\fR=[small,kernel,medium,large]
-Choose the code model to use.
-.TP
-\fBmetadata\fR=val
-Metadata to mangle symbol names with.
-.TP
-\fBextra-filename\fR=val
-Extra data to put in each output filename.
-.TP
-\fBcodegen-units\fR=val
-Divide crate into N units to optimize in parallel.
-.TP
-\fBremark\fR=val
-Print remarks for these optimization passes (space separated, or "all").
-.TP
-\fBno-stack-check\fR
-Disable checks for stack exhaustion (a memory-safety hazard!).
-.TP
-\fBdebuginfo\fR=val
-Debug info emission level:
-    0 = no debug info;
-    1 = line-tables only (for stacktraces and breakpoints);
-    2 = full debug info with variable and type information.
-.TP
-\fBopt-level\fR=val
-Optimize with possible levels 0-3
+The relocation model to use. (default: pic)
 
 .SH "EXAMPLES"
 To build an executable from a source file with a main function:

branches/snap-stage3/mk/rt.mk

@@ -35,7 +35,7 @@
 # that's per-target so you're allowed to conditionally add files based on the
 # target.
 ################################################################################
-NATIVE_LIBS := rust_builtin hoedown morestack miniz \
+NATIVE_LIBS := rust_builtin hoedown morestack miniz context_switch \
 		rustrt_native rust_test_helpers
 
 # $(1) is the target triple
@@ -58,7 +58,8 @@ NATIVE_DEPS_rustrt_native_$(1) := \
 			arch/$$(HOST_$(1))/record_sp.S
 NATIVE_DEPS_rust_test_helpers_$(1) := rust_test_helpers.c
 NATIVE_DEPS_morestack_$(1) := arch/$$(HOST_$(1))/morestack.S
-
+NATIVE_DEPS_context_switch_$(1) := \
+			arch/$$(HOST_$(1))/_context.S
 
 ################################################################################
 # You shouldn't find it that necessary to edit anything below this line.

branches/snap-stage3/src/compiletest/compiletest.rs

@@ -152,7 +152,7 @@ pub fn parse_config(args: Vec<String> ) -> Config {
             matches.opt_str("ratchet-metrics").map(|s| Path::new(s)),
         ratchet_noise_percent:
             matches.opt_str("ratchet-noise-percent")
-                   .and_then(|s| s.as_slice().parse::<f64>()),
+                   .and_then(|s| from_str::<f64>(s.as_slice())),
         runtool: matches.opt_str("runtool"),
         host_rustcflags: matches.opt_str("host-rustcflags"),
         target_rustcflags: matches.opt_str("target-rustcflags"),
@@ -190,7 +190,9 @@ pub fn log_config(config: &Config) {
     logv(c, format!("filter: {}",
                     opt_str(&config.filter
                                    .as_ref()
-                                   .map(|re| re.to_string()))));
+                                   .map(|re| {
+                                       re.to_string().into_string()
+                                   }))));
     logv(c, format!("runtool: {}", opt_str(&config.runtool)));
     logv(c, format!("host-rustcflags: {}",
                     opt_str(&config.host_rustcflags)));

branches/snap-stage3/src/compiletest/header.rs

@@ -351,8 +351,8 @@ pub fn gdb_version_to_int(version_string: &str) -> int {
         panic!("{}", error_string);
     }
 
-    let major: int = components[0].parse().expect(error_string);
-    let minor: int = components[1].parse().expect(error_string);
+    let major: int = from_str(components[0]).expect(error_string);
+    let minor: int = from_str(components[1]).expect(error_string);
 
     return major * 1000 + minor;
 }
@@ -362,6 +362,6 @@ pub fn lldb_version_to_int(version_string: &str) -> int {
         "Encountered LLDB version string with unexpected format: {}",
         version_string);
     let error_string = error_string.as_slice();
-    let major: int = version_string.parse().expect(error_string);
+    let major: int = from_str(version_string).expect(error_string);
     return major;
 }

branches/snap-stage3/src/compiletest/runtest.rs

@@ -1361,7 +1361,7 @@ fn split_maybe_args(argstr: &Option<String>) -> Vec<String> {
             s.as_slice()
              .split(' ')
              .filter_map(|s| {
-                 if s.chars().all(|c| c.is_whitespace()) {
+                 if s.is_whitespace() {
                      None
                  } else {
                      Some(s.to_string())

branches/snap-stage3/src/doc/complement-bugreport.md

@@ -34,7 +34,7 @@ miss out on valid bug reports.
 It generally helps our diagnosis to include your specific OS (for example: Mac OS X 10.8.3,
 Windows 7, Ubuntu 12.04) and your hardware architecture (for example: i686, x86_64).
 It's also helpful to provide the exact version and host by copying the output of
-re-running the erroneous rustc command with the `--version --verbose` flags, which will
+re-running the erroneous rustc command with the `--version=verbose` flag, which will
 produce something like this:
 
 ```text

branches/snap-stage3/src/doc/guide.md

@@ -1010,8 +1010,8 @@ in the original declaration.
 Finally, because fields have names, we can access the field through dot
 notation: `origin.x`.
 
-The values in structs are immutable by default, like other bindings in Rust.
-Use `mut` to make them mutable:
+The values in structs are immutable, like other bindings in Rust. However, you
+can use `mut` to make them mutable:
 
 ```{rust}
 struct Point {
@@ -2257,10 +2257,10 @@ a function for that:
 let input = io::stdin().read_line()
                        .ok()
                        .expect("Failed to read line");
-let input_num: Option<uint> = input.parse();
+let input_num: Option<uint> = from_str(input.as_slice());
 ```
 
-The `parse` function takes in a `&str` value and converts it into something.
+The `from_str` function takes in a `&str` value and converts it into something.
 We tell it what kind of something with a type hint. Remember our type hint with
 `random()`? It looked like this:
 
@@ -2279,8 +2279,8 @@ In this case, we say `x` is a `uint` explicitly, so Rust is able to properly
 tell `random()` what to generate. In a similar fashion, both of these work:
 
 ```{rust,ignore}
-let input_num = "5".parse::<uint>();         // input_num: Option<uint>
-let input_num: Option<uint> = "5".parse();   // input_num: Option<uint>
+let input_num = from_str::<uint>("5");       // input_num: Option<uint>
+let input_num: Option<uint> = from_str("5"); // input_num: Option<uint>
 ```
 
 Anyway, with us now converting our input to a number, our code looks like this:
@@ -2301,7 +2301,7 @@ fn main() {
     let input = io::stdin().read_line()
                            .ok()
                            .expect("Failed to read line");
-    let input_num: Option<uint> = input.parse();
+    let input_num: Option<uint> = from_str(input.as_slice());
 
     println!("You guessed: {}", input_num);
 
@@ -2350,7 +2350,7 @@ fn main() {
     let input = io::stdin().read_line()
                            .ok()
                            .expect("Failed to read line");
-    let input_num: Option<uint> = input.parse();
+    let input_num: Option<uint> = from_str(input.as_slice());
 
     let num = match input_num {
         Some(num) => num,
@@ -2395,7 +2395,7 @@ Uh, what? But we did!
 
 ... actually, we didn't. See, when you get a line of input from `stdin()`,
 you get all the input. Including the `\n` character from you pressing Enter.
-Therefore, `parse()` sees the string `"5\n"` and says "nope, that's not a
+Therefore, `from_str()` sees the string `"5\n"` and says "nope, that's not a
 number; there's non-number stuff in there!" Luckily for us, `&str`s have an easy
 method we can use defined on them: `trim()`. One small modification, and our
 code looks like this:
@@ -2416,7 +2416,7 @@ fn main() {
     let input = io::stdin().read_line()
                            .ok()
                            .expect("Failed to read line");
-    let input_num: Option<uint> = input.trim().parse();
+    let input_num: Option<uint> = from_str(input.as_slice().trim());
 
     let num = match input_num {
         Some(num) => num,
@@ -2491,7 +2491,7 @@ fn main() {
         let input = io::stdin().read_line()
                                .ok()
                                .expect("Failed to read line");
-        let input_num: Option<uint> = input.trim().parse();
+        let input_num: Option<uint> = from_str(input.as_slice().trim());
 
         let num = match input_num {
             Some(num) => num,
@@ -2566,7 +2566,7 @@ fn main() {
         let input = io::stdin().read_line()
                                .ok()
                                .expect("Failed to read line");
-        let input_num: Option<uint> = input.trim().parse();
+        let input_num: Option<uint> = from_str(input.as_slice().trim());
 
         let num = match input_num {
             Some(num) => num,
@@ -2621,7 +2621,7 @@ fn main() {
         let input = io::stdin().read_line()
                                .ok()
                                .expect("Failed to read line");
-        let input_num: Option<uint> = input.trim().parse();
+        let input_num: Option<uint> = from_str(input.as_slice().trim());
 
         let num = match input_num {
             Some(num) => num,
@@ -2697,7 +2697,7 @@ fn main() {
         let input = io::stdin().read_line()
                                .ok()
                                .expect("Failed to read line");
-        let input_num: Option<uint> = input.trim().parse();
+        let input_num: Option<uint> = from_str(input.as_slice().trim());
 
         let num = match input_num {
             Some(num) => num,

branches/snap-stage3/src/doc/reference.md

@@ -3177,7 +3177,7 @@ Some examples of call expressions:
 # fn add(x: int, y: int) -> int { 0 }
 
 let x: int = add(1, 2);
-let pi: Option<f32> = "3.14".parse();
+let pi: Option<f32> = from_str("3.14");
 ```
 
 ### Lambda expressions