---

yaml
---
r: 47678
b: refs/heads/incoming
c: 9727008
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 2a8fb58d79e685d5ca07b039badcf2ae3ef077ea
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/incoming: 3201c6fe3f39fa4123ae373b1d7d09b68eca772b
+refs/heads/incoming: 9727008ed0772fc325e0822e74b429e4e7c09af0
 refs/heads/dist-snap: 8b98e5a296d95c5e832db0756828e5bec31c6f50
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/rust.md

@@ -686,15 +686,15 @@ mod math {
     type complex = (f64, f64);
     fn sin(f: f64) -> f64 {
         ...
-# die!();
+# fail!();
     }
     fn cos(f: f64) -> f64 {
         ...
-# die!();
+# fail!();
     }
     fn tan(f: f64) -> f64 {
         ...
-# die!();
+# fail!();
     }
 }
 ~~~~~~~~
@@ -986,7 +986,7 @@ output slot type would normally be. For example:
 ~~~~
 fn my_err(s: &str) -> ! {
     log(info, s);
-    die!();
+    fail!();
 }
 ~~~~
 
@@ -1004,7 +1004,7 @@ were declared without the `!` annotation, the following code would not
 typecheck:
 
 ~~~~
-# fn my_err(s: &str) -> ! { die!() }
+# fn my_err(s: &str) -> ! { fail!() }
 
 fn f(i: int) -> int {
    if i == 42 {
@@ -2284,9 +2284,9 @@ enum List<X> { Nil, Cons(X, @List<X>) }
 let x: List<int> = Cons(10, @Cons(11, @Nil));
 
 match x {
-    Cons(_, @Nil) => die!(~"singleton list"),
+    Cons(_, @Nil) => fail!(~"singleton list"),
     Cons(*)       => return,
-    Nil           => die!(~"empty list")
+    Nil           => fail!(~"empty list")
 }
 ~~~~
 
@@ -2323,7 +2323,7 @@ match x {
         return;
     }
     _ => {
-        die!();
+        fail!();
     }
 }
 ~~~~
@@ -2411,7 +2411,7 @@ guard may refer to the variables bound within the pattern they follow.
 let message = match maybe_digit {
   Some(x) if x < 10 => process_digit(x),
   Some(x) => process_other(x),
-  None => die!()
+  None => fail!()
 };
 ~~~~
 

branches/incoming/doc/tutorial-macros.md

@@ -218,7 +218,7 @@ match x {
                 // complicated stuff goes here
                 return result + val;
             },
-            _ => die!(~"Didn't get good_2")
+            _ => fail!(~"Didn't get good_2")
         }
     }
     _ => return 0 // default value
@@ -260,7 +260,7 @@ macro_rules! biased_match (
 biased_match!((x)       ~ (good_1(g1, val)) else { return 0 };
               binds g1, val )
 biased_match!((g1.body) ~ (good_2(result) )
-                  else { die!(~"Didn't get good_2") };
+                  else { fail!(~"Didn't get good_2") };
               binds result )
 // complicated stuff goes here
 return result + val;
@@ -362,7 +362,7 @@ macro_rules! biased_match (
 # fn f(x: t1) -> uint {
 biased_match!(
     (x)       ~ (good_1(g1, val)) else { return 0 };
-    (g1.body) ~ (good_2(result) ) else { die!(~"Didn't get good_2") };
+    (g1.body) ~ (good_2(result) ) else { fail!(~"Didn't get good_2") };
     binds val, result )
 // complicated stuff goes here
 return result + val;

branches/incoming/doc/tutorial-tasks.md

@@ -313,7 +313,7 @@ of all tasks are intertwined: if one fails, so do all the others.
 # fn do_some_work() { loop { task::yield() } }
 # do task::try {
 // Create a child task that fails
-do spawn { die!() }
+do spawn { fail!() }
 
 // This will also fail because the task we spawned failed
 do_some_work();
@@ -337,7 +337,7 @@ let result: Result<int, ()> = do task::try {
     if some_condition() {
         calculate_result()
     } else {
-        die!(~"oops!");
+        fail!(~"oops!");
     }
 };
 assert result.is_err();
@@ -370,14 +370,14 @@ proceed). Hence, you will need different _linked failure modes_.
 ## Failure modes
 
 By default, task failure is _bidirectionally linked_, which means that if
-either task dies, it kills the other one.
+either task fails, it kills the other one.
 
 ~~~
 # fn sleep_forever() { loop { task::yield() } }
 # do task::try {
 do task::spawn {
     do task::spawn {
-        die!();  // All three tasks will die.
+        fail!();  // All three tasks will fail.
     }
     sleep_forever();  // Will get woken up by force, then fail
 }
@@ -386,7 +386,7 @@ sleep_forever();  // Will get woken up by force, then fail
 ~~~
 
 If you want parent tasks to be able to kill their children, but do not want a
-parent to die automatically if one of its child task dies, you can call
+parent to fail automatically if one of its child task fails, you can call
 `task::spawn_supervised` for _unidirectionally linked_ failure. The
 function `task::try`, which we saw previously, uses `spawn_supervised`
 internally, with additional logic to wait for the child task to finish
@@ -432,7 +432,7 @@ do task::spawn_supervised {
     // Intermediate task immediately exits
 }
 wait_for_a_while();
-die!();  // Will kill grandchild even if child has already exited
+fail!();  // Will kill grandchild even if child has already exited
 # };
 ~~~
 
@@ -446,10 +446,10 @@ other at all, using `task::spawn_unlinked` for _isolated failure_.
 let (time1, time2) = (random(), random());
 do task::spawn_unlinked {
     sleep_for(time2);  // Won't get forced awake
-    die!();
+    fail!();
 }
 sleep_for(time1);  // Won't get forced awake
-die!();
+fail!();
 // It will take MAX(time1,time2) for the program to finish.
 # };
 ~~~

branches/incoming/man/rustc.1

@@ -1,9 +1,9 @@
-.TH RUSTC "1" "October 2012" "rustc 0.4" "User Commands"
+.TH RUSTC "1" "February 2013" "rustc 0.6" "User Commands"
 .SH NAME
 rustc \- rust compiler
 .SH SYNOPSIS
 .B rustc
-[\fIoptions\fR] \fI<input>\fR
+[\fIOPTIONS\fR] \fIINPUT\fR
 
 .SH DESCRIPTION
 This program is a compiler for the Rust language, available at
@@ -18,88 +18,134 @@ Compile an executable crate (default)
 \fB\-c\fR
 Compile and assemble, but do not link
 .TP
-\fB\-\-cfg\fR <cfgspec>
+\fB\-\-cfg\fR SPEC
 Configure the compilation environment
 .TP
 \fB\-\-emit\-llvm\fR
 Produce an LLVM bitcode file
 .TP
-\fB\-g\fR
-Produce debug info (experimental)
-.TP
-\fB\-\-gc\fR
-Garbage collect shared data (experimental/temporary)
-.TP
-\fB\-h\fR \fB\-\-help\fR
+\fB\-h\fR, \fB\-\-help\fR
 Display this message
 .TP
-\fB\-L\fR <path>
+\fB\-L\fR PATH
 Add a directory to the library search path
 .TP
 \fB\-\-lib\fR
 Compile a library crate
 .TP
 \fB\-\-ls\fR
-List the symbols defined by a compiled library crate
-.TP
-\fB\-\-jit\fR
-Execute using JIT (experimental)
+List the symbols defined by a library crate
 .TP
 \fB\-\-no\-trans\fR
 Run all passes except translation; no output
 .TP
 \fB\-O\fR
-Equivalent to \fB\-\-opt\-level\fR=\fI2\fR
+Equivalent to \fI\-\-opt\-level=2\fR
 .TP
-\fB\-o\fR <filename>
+\fB\-o\fR FILENAME
 Write output to <filename>
 .TP
-\fB\-\-opt\-level\fR <lvl>
-Optimize with possible levels 0\-3
+\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>
+\fB\-\-out\-dir\fR DIR
+Write output to compiler-chosen filename in <dir>
 .TP
 \fB\-\-parse\-only\fR
 Parse only; do not compile, assemble, or link
 .TP
-\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), or identified (fully
-parenthesized, AST nodes and blocks with IDs)
+\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), or identified (fully parenthesized,
+AST nodes and blocks with IDs)
 .TP
 \fB\-S\fR
 Compile only; do not assemble or link
 .TP
 \fB\-\-save\-temps\fR
-Write intermediate files (.bc, .opt.bc, .o)
-in addition to normal output
+Write intermediate files (.bc, .opt.bc, .o) in addition to normal output
 .TP
-\fB\-\-static\fR
-Use or produce static libraries or binaries
-(experimental)
-.TP
-\fB\-\-sysroot\fR <path>
+\fB\-\-sysroot\fR PATH
 Override the system root
 .TP
 \fB\-\-test\fR
 Build a test harness
 .TP
-\fB\-\-target\fR <triple>
-Target cpu\-manufacturer\-kernel[\-os] to compile for
-(default: host triple)
-(see http://sources.redhat.com/autobook/autobook/
-autobook_17.html for detail)
+\fB\-\-target\fR TRIPLE
+Target triple cpu-manufacturer-kernel[-os] to compile for (see
+http://sources.redhat.com/autobook/autobook/autobook_17.html
+for detail)
 .TP
-\fB\-W help\fR
+\fB\-W\fR help
 Print 'lint' options and default settings
 .TP
-\fB\-Z help\fR
-Print internal options for debugging rustc
+\fB\-W\fR OPT, \fB\-\-warn\fR OPT
+Set lint warnings
+.TP
+\fB\-A\fR OPT, \fB\-\-allow\fR OPT
+Set lint allowed
 .TP
-\fB\-v\fR \fB\-\-version\fR
+\fB\-D\fR OPT, \fB\-\-deny\fR OPT
+Set lint denied
+.TP
+\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.
+
+Available debug flags are:
+.RS
+.IP \[bu]
+\fBverbose\fR - in general, enable more debug printouts
+.IP \[bu]
+\fBtime\-passes\fR - measure time of each rustc pass
+.IP \[bu]
+\fBcount\-llvm\-insns\fR - count where LLVM instrs originate
+.IP \[bu]
+\fBtime\-llvm\-passes\fR - measure time of each LLVM pass
+.IP \[bu]
+\fBtrans\-stats\fR - gather trans statistics
+.IP \[bu]
+\fBno\-asm\-comments\fR - omit comments when using \fI\-S\fR
+.IP \[bu]
+\fBno\-verify\fR - skip LLVM verification
+.IP \[bu]
+\fBtrace\fR - emit trace logs
+.IP \[bu]
+\fBcoherence\fR - perform coherence checking
+.IP \[bu]
+\fBborrowck\-stats\fR - gather borrowck statistics
+.IP \[bu]
+\fBborrowck\-note\-pure\fR - note where purity is req'd
+.IP \[bu]
+\fBborrowck\-note\-loan\fR - note where loans are req'd
+.IP \[bu]
+\fBno\-landing\-pads\fR - omit landing pads for unwinding
+.IP \[bu]
+\fBdebug\-llvm\fR - enable debug output from LLVM
+.IP \[bu]
+\fBcount\-type\-sizes\fR - count the sizes of aggregate types
+.IP \[bu]
+\fBmeta\-stats\fR - gather metadata statistics
+.IP \[bu]
+\fBno\-opt\fR - do not optimize, even if \fI\-O\fR is passed
+.IP \[bu]
+\fBno\-monomorphic\-collapse\fR - do not collapse template instantiations
+.IP \[bu]
+\fBgc\fR - Garbage collect shared data (experimental)
+.IP \[bu]
+\fBjit\fR - Execute using JIT (experimental)
+.IP \[bu]
+\fBextra\-debug\-info\fR - Extra debugging info (experimental)
+.IP \[bu]
+\fBdebug\-info\fR - Produce debug info (experimental)
+.IP \[bu]
+\fBstatic\fR - Use or produce static libraries or binaries (experimental)
+.RE
+.TP
+\fB\-v\fR, \fB\-\-version\fR
 Print version info and exit
 
 .SH "EXAMPLES"
@@ -112,6 +158,10 @@ To build a library from a source file:
 To build either with a crate (.rc) file:
     $ rustc hello.rc
 
+To build an executable with debug info (experimental):
+    $ rustc -Z debug-info -o hello hello.rs
+
+
 .SH "BUGS"
 See <\fBhttps://github.com/mozilla/rust/issues\fR> for issues.