---

yaml
---
r: 15344
b: refs/heads/try
c: ce8023b
h: refs/heads/master
v: v3

Author: brson

[refs]

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

branches/try/doc/rust.md

@@ -1617,9 +1617,9 @@ is bounds-checked at run-time. When the check fails, it will put the
 task in a _failing state_.
 
 ~~~~
-# let builder = task::task_builder();
-# task::unsupervise(builder);
-# task::run(builder) {||
+# let buildr = task::builder();
+# task::unsupervise(buildr);
+# task::run(buildr) {||
 
 [1, 2, 3, 4][0];
 [mut 'x', 'y'][1] = 'z';

branches/try/doc/tutorial.md

@@ -1686,6 +1686,7 @@ purpose, you create a `.rc` crate file, which references any number of
 
 ~~~~ {.ignore}
 #[link(name = "farm", vers = "2.5", author = "mjh")];
+#[crate_type = "lib"];
 mod cow;
 mod chicken;
 mod horse;
@@ -1694,7 +1695,9 @@ mod horse;
 Compiling this file will cause `rustc` to look for files named
 `cow.rs`, `chicken.rs`, `horse.rs` in the same directory as the `.rc`
 file, compile them all together, and, depending on the presence of the
-`--lib` switch, output a shared library or an executable.
+`crate_type = "lib"` attribute, output a shared library or an executable.
+(If the line `#[crate_type = "lib"];` was omitted, `rustc` would create an
+executable.)
 
 The `#[link(...)]` part provides meta information about the module,
 which other crates can use to load the right module. More about that
@@ -1717,9 +1720,9 @@ content to the `poultry` module itself.
 
 ## Using other crates
 
-Having compiled a crate with `--lib`, you can use it in another crate
-with a `use` directive. We've already seen `use std` in several of the
-examples, which loads in the [standard library][std].
+Having compiled a crate that contains the `#[crate_type = "lib"]` attribute,
+you can use it in another crate with a `use` directive. We've already seen
+`use std` in several of the examples, which loads in the [standard library][std].
 
 [std]: http://doc.rust-lang.org/doc/std/index/General.html
 

branches/try/src/cargo/cargo.rc

@@ -17,4 +17,12 @@
 
 #[crate_type = "bin"];
 
+#[no_core];
+
+use core(vers = "0.2");
+use std(vers = "0.2");
+use rustc(vers = "0.2");
+
+import core::*;
+
 mod pgp;

branches/try/src/cargo/cargo.rs

@@ -1,8 +1,5 @@
 // cargo.rs - Rust package manager
 
-use rustc;
-use std;
-
 import rustc::syntax::{ast, codemap};
 import rustc::syntax::parse::parser;
 import rustc::util::filesearch::{get_cargo_root, get_cargo_root_nearest,

branches/try/src/cargo/pgp.rs

@@ -1,5 +1,3 @@
-use std;
-
 fn gpg(args: [str]) -> { status: int, out: str, err: str } {
     ret run::program_output("gpg", args);
 }

branches/try/src/compiletest/compiletest.rc

@@ -1,6 +1,11 @@
 #[crate_type = "bin"];
 
-use std;
+#[no_core];
+
+use core(vers = "0.2");
+use std(vers = "0.2");
+
+import core::*;
 
 mod procsrv;
 mod util;

branches/try/src/compiletest/runtest.rs

@@ -246,7 +246,7 @@ fn check_expected_errors(expected_errors: [errors::expected_error],
     // is the ending point, and * represents ANSI color codes.
     for line: str in str::split_char(procres.stderr, '\n') {
         let mut was_expected = false;
-        vec::iteri(expected_errors) {|i, ee|
+        for vec::eachi(expected_errors) {|i, ee|
             if !found_flags[i] {
                 #debug["prefix=%s ee.kind=%s ee.msg=%s line=%s",
                        prefixes[i], ee.kind, ee.msg, line];
@@ -255,6 +255,7 @@ fn check_expected_errors(expected_errors: [errors::expected_error],
                     str::contains(line, ee.msg)) {
                     found_flags[i] = true;
                     was_expected = true;
+                    break;
                 }
             }
         }

branches/try/src/etc/indenter

@@ -0,0 +1,17 @@
+#!/usr/bin/perl -w
+
+$ident = 0;
+while (<>) {
+    if (/^rust: ">>/) {
+        $indent += 1;
+    } elsif (/^rust: "<</) {
+        $indent -= 1;
+    }
+
+    printf "%03d  ", $indent;
+    for ($i = 0; $i < $indent; $i++) {
+        printf("  ");
+    }
+    print;
+}
+

branches/try/src/fuzzer/fuzzer.rc

@@ -2,8 +2,13 @@
 
 #[crate_type = "bin"];
 
-use std;
-use rustc;
+#[no_core];
+
+use core(vers = "0.2");
+use std(vers = "0.2");
+use rustc(vers = "0.2");
+
+import core::*;
 
 // Local Variables:
 // fill-column: 78;

branches/try/src/libcore/core.rs

@@ -40,7 +40,7 @@ mod core {
 // Similar to above. Some magic to make core testable.
 #[cfg(test)]
 mod std {
-    use std;
+    use std(vers = "0.2");
     import std::test;
 }
 

branches/try/src/libcore/os.rs

@@ -849,7 +849,7 @@ mod tests {
       };
       assert (ostream as uint != 0u);
       let s = "hello";
-      let mut buf = str::bytes(s) + [0 as u8];
+      let mut buf = vec::to_mut(str::bytes(s) + [0 as u8]);
       vec::as_mut_buf(buf) {|b|
          assert (libc::fwrite(b as *c_void, 1u, str::len(s) + 1u, ostream) ==
                  buf.len())};

branches/try/src/libcore/str.rs

@@ -1658,7 +1658,7 @@ mod unsafe {
    Does not verify that the vector contains valid UTF-8.
    "]
    unsafe fn from_bytes(v: [const u8]) -> str unsafe {
-       let mut vcopy: [u8] = v + [0u8];
+       let vcopy = v + [0u8];
        let scopy: str = ::unsafe::reinterpret_cast(vcopy);
        ::unsafe::forget(vcopy);
        ret scopy;