---

yaml
---
r: 35910
b: refs/heads/try2
c: d81d4f1
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 0b1a401bb73299640eaec28937228538d916887a
+refs/heads/try2: d81d4f1f3c94716c6dcafaf88d860aaa5d3598ca
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/doc/rust.md

@@ -859,8 +859,8 @@ fn main() {
     log(info, Some(1.0));
 
     // Equivalent to 'log(core::info,
-    //                    core::str::to_upper(core::str::slice(~"foo", 0u, 1u)));'
-    log(info, to_upper(slice(~"foo", 0u, 1u)));
+    //                    core::str::to_upper(core::str::slice("foo", 0u, 1u)));'
+    log(info, to_upper(slice("foo", 0u, 1u)));
 }
 ~~~~
 
@@ -1050,14 +1050,14 @@ were declared without the `!` annotation, the following code would not
 typecheck:
 
 ~~~~
-# fn my_err(s: ~str) -> ! { fail }
+# fn my_err(s: &str) -> ! { fail }
 
 fn f(i: int) -> int {
    if i == 42 {
      return 42;
    }
    else {
-     my_err(~"Bad number!");
+     my_err("Bad number!");
    }
 }
 ~~~~
@@ -1502,7 +1502,7 @@ string, boolean value, or the nil value.
 
 ~~~~~~~~ {.literals}
 ();        // nil type
-~"hello";  // string type
+"hello";   // string type
 '5';       // character type
 5;         // integer type
 ~~~~~~~~
@@ -1520,7 +1520,7 @@ values.
 
 ~~~~~~~~ {.tuple}
 (0f, 4.5f);
-(~"a", 4u, true);
+("a", 4u, true);
 ~~~~~~~~
 
 ### Record expressions
@@ -1539,8 +1539,8 @@ written before its name.
 
 ~~~~
 {x: 10f, y: 20f};
-{name: ~"Joe", age: 35u, score: 100_000};
-{ident: ~"X", mut count: 0u};
+{name: "Joe", age: 35u, score: 100_000};
+{ident: "X", mut count: 0u};
 ~~~~
 
 The order of the fields in a record expression is significant, and
@@ -1609,7 +1609,7 @@ When no mutability is specified, the vector is immutable.
 
 ~~~~
 ~[1, 2, 3, 4];
-~[~"a", ~"b", ~"c", ~"d"];
+~["a", "b", "c", "d"];
 ~[mut 0u8, 0u8, 0u8, 0u8];
 ~~~~
 
@@ -1633,7 +1633,7 @@ task in a _failing state_.
 
 (~[1, 2, 3, 4])[0];
 (~[mut 'x', 'y'])[1] = 'z';
-(~[~"a", ~"b"])[10]; // fails
+(~["a", "b"])[10]; // fails
 
 # }
 ~~~~
@@ -2034,7 +2034,7 @@ An example:
 let mut i = 0;
 
 while i < 10 {
-    io::println(~"hello\n");
+    io::println("hello\n");
     i = i + 1;
 }
 ~~~~
@@ -2281,9 +2281,9 @@ range of values may be specified with `..`. For example:
 # let x = 2;
 
 let message = match x {
-  0 | 1  => ~"not many",
-  2 .. 9 => ~"a few",
-  _      => ~"lots"
+  0 | 1  => "not many",
+  2 .. 9 => "a few",
+  _      => "lots"
 };
 ~~~~
 
@@ -2366,7 +2366,7 @@ The following examples all produce the same output, logged at the `error`
 logging level:
 
 ~~~~
-# let filename = ~"bulbasaur";
+# let filename = "bulbasaur";
 
 // Full version, logging a value.
 log(core::error, ~"file not found: " + filename);