---

yaml
---
r: 30351
b: refs/heads/incoming
c: 9097410
h: refs/heads/master
i:
  30349: adcf032
  30347: 887408c
  30343: 0043b97
  30335: 145ca46
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 0ddae5ec7dc2c1a4237bb091e52fff5940f18b48
+refs/heads/incoming: 9097410b433c0d7c7dca8f9296161b3074a8d21e
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/tutorial.md

@@ -1330,7 +1330,7 @@ This code creates a closure that adds a given string to its argument,
 returns it from a function, and then calls it:
 
 ~~~~
-use std;
+extern mod std;
 
 fn mk_appender(suffix: ~str) -> fn@(~str) -> ~str {
     return fn@(s: ~str) -> ~str { s + suffix };
@@ -1680,9 +1680,10 @@ content to the `poultry` module itself.
 
 ## Using other crates
 
-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].
+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 `extern mod std` in several of the
+examples, which loads in the [standard library][std].
 
 [std]: http://doc.rust-lang.org/doc/std/index/General.html
 
@@ -1738,7 +1739,7 @@ fn world() -> ~str { ~"world" }
 
 ~~~~ {.ignore}
 // main.rs
-use std;
+extern mod std;
 use mylib;
 fn main() { io::println(~"hello " + mylib::world()); }
 ~~~~
@@ -2254,7 +2255,7 @@ Tests can be interspersed with other code, and annotated with the
 ~~~~{.xfail-test}
 # // FIXME: xfailed because test_twice is a #[test] function it's not
 # // getting compiled
-use std;
+extern mod std;
 
 fn twice(x: int) -> int { x + x }
 
@@ -2302,7 +2303,7 @@ To indicate that a test is supposed to fail instead of pass, you can
 give it a `#[should_fail]` attribute.
 
 ~~~~
-use std;
+extern mod std;
 
 fn divide(a: float, b: float) -> float {
     if b == 0f { fail; }

branches/incoming/src/etc/extract-tests.py

@@ -51,8 +51,8 @@
         if not ignore:
             if not re.search(r"\bfn main\b", block):
                 block = "fn main() {\n" + block + "\n}\n"
-            if not re.search(r"\buse std\b", block):
-                block = "use std;\n" + block;
+            if not re.search(r"\bextern mod std\b", block):
+                block = "extern mod std;\n" + block;
             if xfail:
                 block = "// xfail-test\n" + block
             filename = (dest + "/" + str(chapter)