---

yaml
---
r: 16069
b: refs/heads/try
c: 0fa7858
h: refs/heads/master
i:
  16067: 41a95d1
v: v3

Author: killerswan

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: 432c6cbde93ca525cc33fd17873a0557dffa07c5
+refs/heads/try: 0fa7858d1e8d4ebf6e881780ec9a37cf22f4c0b0
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/man/rustc.1

@@ -1,116 +1,114 @@
-.TH RUSTC "1" "January 2012" "Rust" "User Commands"
-
+.TH RUSTC "1" "May 2012" "rustc 0.2 (23fcab9)" "User Commands"
 .SH NAME
 rustc \- rust compiler
-
 .SH SYNOPSIS
-rustc [\fB-h\fR] [\fB-v\fR] [\fB-o\fR \fIoutfile\fR]
-      [\fB--lib\fR] [\fB--static\fR] [\fB-L\fR \fIpath\fR]
-      [\fB-g\fR] [\fB-S\fR] [\fB-c\fR] <\fIinput\fR>
-.PP
-Only the most commonly-used options are listed here. All options are listed and
-described below.
+.B rustc
+[\fIoptions\fR] \fI<input>\fR
 
 .SH DESCRIPTION
 This program is a compiler for the Rust language, available at
 <\fBhttps://www.rust-lang.org\fR>.
 
 .SH OPTIONS
+
 .TP
-\fB--bin\fR
+\fB\-\-bin\fR
 Compile an executable crate (default)
 .TP
-\fB-c\fR
+\fB\-c\fR
 Compile and assemble, but do not link
 .TP
-\fB--cfg <cfgspec>\fR
+\fB\-\-cfg\fR <cfgspec>
 Configure the compilation environment
 .TP
-\fB--emit-llvm\fR
+\fB\-\-emit\-llvm\fR
 Produce an LLVM bitcode file
 .TP
-\fB-g\fR
+\fB\-g\fR
 Produce debug info
 .TP
-\fB--gc\fR
+\fB\-\-gc\fR
 Garbage collect shared data (experimental/temporary)
 .TP
-\fB-h --help\fR
+\fB\-h\fR \fB\-\-help\fR
 Display this message
 .TP
-\fB-L <path>\fR
+\fB\-L\fR <path>
 Add a directory to the library search path
 .TP
-\fB--lib\fR
+\fB\-\-lib\fR
 Compile a library crate
 .TP
-\fB--ls\fR
-List the symbols defined by a compiled librar crate
+\fB\-\-ls\fR
+List the symbols defined by a compiled library crate
 .TP
-\fB--no-asm-comments\fR
-Do not add comments into the assembly source
-.TP
-\fB--no-lint-ctypes\fR
-Suppress warnings for possibly incorrect ctype usage
-.TP
-\fB--no-trans\fR
+\fB\-\-no\-trans\fR
 Run all passes except translation; no output
 .TP
-\fB--no-verify\fR
-Suppress LLVM verification step (slight speedup)
-(see http://llvm.org/docs/Passes.html for detail)
-.TP
-\fB-O\fR
-Equivalent to --opt-level=2
+\fB\-O\fR
+Equivalent to \fB\-\-opt\-level\fR=\fI2\fR
 .TP
-\fB-o <filename>\fR
+\fB\-o\fR <filename>
 Write output to <filename>
 .TP
-\fB--opt-level <lvl>\fR
-Optimize with possible levels 0-3
+\fB\-\-opt\-level\fR <lvl>
+Optimize with possible levels 0\-3
 .TP
-\fB--out-dir <dir>\fR
-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
+\fB\-\-parse\-only\fR
 Parse only; do not compile, assemble, or link
 .TP
-\fB--pretty [type]\fR
-Pretty-print the input instead of compiling; valid types are: \fBnormal\fR (un-annotated source), \fBexpanded\fR (crates expanded), \fBtyped\fR (crates expanded, with type annotations), or \fBidentified\fR (fully parenthesized, AST nodes and blocks with IDs)
+\fB\-\-pretty\fR [type]
+Pretty\-print the input instead of compiling;
+valid types are: \fBnormal\fR (un\-annotated source),
+\fBexpanded\fR (crates expanded), \fBtyped\fR (crates expanded,
+with type annotations), or \fBidentified\fR (fully
+parenthesized, AST nodes and blocks with IDs)
 .TP
-\fB-S\fR
+\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
+\fB\-\-save\-temps\fR
+Write intermediate files (.bc, .opt.bc, .o)
+in addition to normal output
 .TP
-\fB--static\fR
+\fB\-\-static\fR
 Use or produce static libraries or binaries
 .TP
-\fB--stats\fR
+\fB\-\-stats\fR
 Print compilation statistics
 .TP
-\fB--sysroot <path>\fR
+\fB\-\-sysroot\fR <path>
 Override the system root
 .TP
-\fB--test\fR
-Build test harness
+\fB\-\-test\fR
+Build a test harness
 .TP
-\fB--target <triple>\fR
-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 cpu\-manufacturer\-kernel[\-os] to compile for
+(default: host triple)
+(see http://sources.redhat.com/autobook/autobook/
+autobook_17.html for detail)
 .TP
-\fB--time-passes\fR
-Time the individual phases of the compiler
+\fB\-W\fR <foo>
+enable warning <foo>
 .TP
-\fB--time-llvm-passes\fR
-Time the individual phases of the LLVM backend
+\fB\-W\fR no\-<foo>
+disable warning <foo>
 .TP
-\fB-v --version\fR
-Print version info and exit
+\fB\-W\fR err\-<foo>
+enable warning <foo> as an error
+.TP
+\fB\-W\fR help
+Print available warnings and default settings
+.TP
+\fB\-Z\fR help
+list internal options for debugging rustc
 .TP
-\fB--warn-unused-imports\fR
-Warn about unnecessary imports
+\fB\-v\fR \fB\-\-version\fR
+Print version info and exit
 
 .SH "EXAMPLES"
 To build an executable from a source file with a main function:
@@ -131,4 +129,3 @@ See \fBAUTHORS.txt\fR in the rust source distribution. Graydon Hoare
 
 .SH "COPYRIGHT"
 See \fBLICENSE.txt\fR in the rust source distribution.
-

branches/try/src/cargo/cargo.rs

@@ -603,7 +603,7 @@ fn install_uuid(c: cargo, wd: str, uuid: str) {
     for_each_package(c, { |s, p|
         info(#fmt["%s ? %s", p.uuid, uuid]);
         if p.uuid == uuid {
-            vec::grow(ps, 1u, (s.name, p));
+            vec::grow(ps, 1u, (s, p));
         }
     });
     if vec::len(ps) == 1u {
@@ -616,16 +616,16 @@ fn install_uuid(c: cargo, wd: str, uuid: str) {
     }
     error("Found multiple packages:");
     for ps.each {|elt|
-        let (sname,p) = elt;
-        info("  " + sname + "/" + p.uuid + " (" + p.name + ")");
+        let (s,p) = elt;
+        info("  " + s.name + "/" + p.uuid + " (" + p.name + ")");
     }
 }
 
 fn install_named(c: cargo, wd: str, name: str) {
     let mut ps = [];
     for_each_package(c, { |s, p|
         if p.name == name {
-            vec::grow(ps, 1u, (s.name, p));
+            vec::grow(ps, 1u, (s, p));
         }
     });
     if vec::len(ps) == 1u {
@@ -638,8 +638,8 @@ fn install_named(c: cargo, wd: str, name: str) {
     }
     error("Found multiple packages:");
     for ps.each {|elt|
-        let (sname,p) = elt;
-        info("  " + sname + "/" + p.uuid + " (" + p.name + ")");
+        let (s,p) = elt;
+        info("  " + s.name + "/" + p.uuid + " (" + p.name + ")");
     }
 }
 

branches/try/src/compiletest/runtest.rs

@@ -277,7 +277,7 @@ fn check_expected_errors(expected_errors: [errors::expected_error],
         }
     }
 
-    for uint::range(0u, vec::len(found_flags)) {|i|
+    uint::range(0u, vec::len(found_flags)) {|i|
         if !found_flags[i] {
             let ee = expected_errors[i];
             fatal_procres(#fmt["expected %s on line %u not found: %s",

branches/try/src/libcore/core.rc

@@ -13,7 +13,7 @@ built-in types and runtime services, or that is used in nearly every
 non-trivial program.
 
 `core` includes modules corresponding to each of the integer types, each of
-the floating point types, the `bool` type, tuples, characters, strings,
+THE floating point types, the `bool` type, tuples, characters, strings,
 vectors (`vec`), shared boxes (`box`), and unsafe pointers (`ptr`).
 Additionally, `core` provides very commonly used built-in types and
 operations, concurrency primitives, platform abstractions, I/O, and complete

branches/try/src/libcore/int-template.rs

@@ -36,12 +36,9 @@ pure fn is_nonpositive(x: T) -> bool { x <= 0 as T }
 pure fn is_nonnegative(x: T) -> bool { x >= 0 as T }
 
 #[doc = "Iterate over the range [`lo`..`hi`)"]
-fn range(lo: T, hi: T, it: fn(T) -> bool) {
+fn range(lo: T, hi: T, it: fn(T)) {
     let mut i = lo;
-    while i < hi {
-        if !it(i) { break }
-        i += 1 as T;
-    }
+    while i < hi { it(i); i += 1 as T; }
 }
 
 #[doc = "Computes the bitwise complement"]

branches/try/src/libcore/priv.rs

@@ -24,7 +24,7 @@ task to receive from it.
 unsafe fn chan_from_global_ptr<T: send>(
     global: global_ptr,
     builder: fn() -> task::builder,
-    +f: fn~(comm::port<T>)
+    f: fn~(comm::port<T>)
 ) -> comm::chan<T> {
 
     enum msg {
@@ -127,12 +127,12 @@ fn test_from_global_chan2() unsafe {
 
         // Spawn a bunch of tasks that all want to compete to
         // create the global channel
-        for uint::range(0u, 10u) {|i|
+        uint::range(0u, 10u) {|i|
             task::spawn() {||
                 let ch = chan_from_global_ptr(
                     globchanp, task::builder) {|po|
 
-                    for uint::range(0u, 10u) {|_j|
+                    uint::range(0u, 10u) {|_j|
                         let ch = comm::recv(po);
                         comm::send(ch, {i});
                     }
@@ -147,7 +147,7 @@ fn test_from_global_chan2() unsafe {
         }
         // There should be only one winner
         let mut winners = 0u;
-        for uint::range(0u, 10u) {|_i|
+        uint::range(0u, 10u) {|_i|
             let res = comm::recv(resultpo);
             if res { winners += 1u };
         }
@@ -233,4 +233,4 @@ fn test_weaken_task_fail() unsafe {
         }
     };
     assert result::is_failure(res);
-}
+}

branches/try/src/libcore/rand.rs

@@ -202,7 +202,7 @@ impl extensions for rng {
     fn weighted_vec<T:copy>(v: [weighted<T>]) -> [T] {
         let mut r = [];
         for v.each {|item|
-            for uint::range(0u, item.weight) {|_i|
+            uint::range(0u, item.weight) {|_i|
                 r += [item.item];
             }
         }

branches/try/src/libcore/to_str.rs

@@ -1,28 +1,13 @@
 iface to_str { fn to_str() -> str; }
 
-impl of to_str for i8 {
-    fn to_str() -> str { i8::str(self) }
+impl of to_str for int {
+    fn to_str() -> str { int::str(self) }
 }
-impl of to_str for i16 {
-    fn to_str() -> str { i16::str(self) }
-}
-impl of to_str for i32 {
-    fn to_str() -> str { i32::str(self) }
-}
-impl of to_str for i64 {
-    fn to_str() -> str { i64::str(self) }
+impl of to_str for uint {
+    fn to_str() -> str { uint::str(self) }
 }
 impl of to_str for u8 {
-    fn to_str() -> str { u8::str(self) }
-}
-impl of to_str for u16 {
-    fn to_str() -> str { u16::str(self) }
-}
-impl of to_str for u32 {
-    fn to_str() -> str { u32::str(self) }
-}
-impl of to_str for u64 {
-    fn to_str() -> str { u64::str(self) }
+    fn to_str() -> str { uint::str(self as uint) }
 }
 impl of to_str for float {
     fn to_str() -> str { float::to_str(self, 4u) }

branches/try/src/libcore/uint-template.rs

@@ -35,12 +35,9 @@ pure fn is_nonpositive(x: T) -> bool { x <= 0 as T }
 pure fn is_nonnegative(x: T) -> bool { x >= 0 as T }
 
 #[doc = "Iterate over the range [`lo`..`hi`)"]
-fn range(lo: T, hi: T, it: fn(T) -> bool) {
+fn range(lo: T, hi: T, it: fn(T)) {
     let mut i = lo;
-    while i < hi {
-        if !it(i) { break }
-        i += 1 as T;
-    }
+    while i < hi { it(i); i += 1 as T; }
 }
 
 #[doc = "Computes the bitwise complement"]

branches/try/src/libcore/vec.rs

@@ -199,6 +199,13 @@ fn from_mut<T>(+v: [mut T]) -> [T] unsafe {
     r
 }
 
+// This function only exists to work around bugs in the type checker.
+fn from_const<T>(+v: [const T]) -> [T] unsafe {
+    let r = ::unsafe::reinterpret_cast(v);
+    ::unsafe::forget(v);
+    r
+}
+
 // Accessors
 
 #[doc = "Returns the first element of a vector"]
@@ -527,7 +534,7 @@ Flattens a vector of vectors of T into a single vector of T.
 "]
 fn concat<T: copy>(v: [const [const T]]) -> [T] {
     let mut r = [];
-    for each(v) {|inner| r += inner; }
+    for each(v) {|inner| r += from_const(inner); }
     ret r;
 }
 
@@ -539,7 +546,7 @@ fn connect<T: copy>(v: [const [const T]], sep: T) -> [T] {
     let mut first = true;
     for each(v) {|inner|
         if first { first = false; } else { push(r, sep); }
-        r += inner;
+        r += from_const(inner);
     }
     ret r;
 }
@@ -892,7 +899,7 @@ Both vectors must have the same length
 #[inline]
 fn iter2<U, T>(v1: [const U], v2: [const T], f: fn(U, T)) {
     assert len(v1) == len(v2);
-    for uint::range(0u, len(v1)) {|i|
+    uint::range(0u, len(v1)) {|i|
         f(v1[i], v2[i])
     }
 }