---

yaml
---
r: 22749
b: refs/heads/master
c: 9ca2a11
h: refs/heads/master
i:
  22747: 3233cd6
v: v3

Author: Elliott Slaughter

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6748f78cb1f360e2b151ed9eb3e487cf1c61ef0e
+refs/heads/master: 9ca2a11137e112233901cbafc11c125e596265fc
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/cargo/cargo.rs

@@ -1616,7 +1616,7 @@ fn cmd_sources(c: cargo) {
     if vec::len(c.opts.free) < 3u {
         for c.sources.each_value |v| {
             info(#fmt("%s (%s) via %s",
-                      v.name, v.url, v.method));
+                      copy v.name, copy v.url, copy v.method));
         }
         ret;
     }

trunk/src/etc/vim/syntax/rust.vim

@@ -20,7 +20,7 @@ syn keyword   rustKeyword     ret self to unchecked
 syn match     rustKeyword     "unsafe" " Allows also matching unsafe::foo()
 syn keyword   rustKeyword     use while with
 " FIXME: Scoped impl's name is also fallen in this category
-syn keyword   rustKeyword     mod iface trait class struct enum type nextgroup=rustIdentifier skipwhite
+syn keyword   rustKeyword     mod iface trait class enum type nextgroup=rustIdentifier skipwhite
 syn keyword   rustKeyword     fn nextgroup=rustFuncName skipwhite
 
 syn match     rustIdentifier  "\%([^[:cntrl:][:space:][:punct:][:digit:]]\|_\)\%([^[:cntrl:][:punct:][:space:]]\|_\)*" display contained

trunk/src/libcore/extfmt.rs

@@ -312,18 +312,18 @@ mod rt {
         let mut s = str::from_char(c);
         ret pad(cv, s, pad_nozero);
     }
-    pure fn conv_str(cv: conv, s: &str) -> ~str {
+    fn conv_str(cv: conv, s: ~str) -> ~str {
         // For strings, precision is the maximum characters
         // displayed
         let mut unpadded = alt cv.precision {
-          count_implied { s.to_unique() }
+          count_implied { s }
           count_is(max) {
             if max as uint < str::char_len(s) {
                 str::substr(s, 0u, max as uint)
-            } else { s.to_unique() }
+            } else { s }
           }
         };
-        ret unchecked { pad(cv, unpadded, pad_nozero) };
+        ret pad(cv, unpadded, pad_nozero);
     }
     fn conv_float(cv: conv, f: float) -> ~str {
         let (to_str, digits) = alt cv.precision {
@@ -398,7 +398,7 @@ mod rt {
           pad_float {   {might_zero_pad:true,  signed:true } }
           pad_unsigned { {might_zero_pad:true,  signed:false} }
         };
-        pure fn have_precision(cv: conv) -> bool {
+        fn have_precision(cv: conv) -> bool {
             ret alt cv.precision { count_implied { false } _ { true } };
         }
         let zero_padding = {
@@ -428,19 +428,11 @@ mod rt {
         }
         ret padstr + s;
     }
-    pure fn have_flag(flags: u32, f: u32) -> bool {
+    fn have_flag(flags: u32, f: u32) -> bool {
         flags & f != 0
     }
 }
 
-#[cfg(test)]
-mod test {
-    #[test]
-    fn fmt_slice() {
-        let s = "abc";
-        let _s = #fmt("%s", s);
-    }
-}
 
 // Local Variables:
 // mode: rust;

trunk/src/libcore/iter-trait/dlist.rs

@@ -7,7 +7,7 @@ type IMPL_T<A> = dlist::dlist<A>;
  * e.g. breadth-first search with in-place enqueues), but removing the current
  * node is forbidden.
  */
-pure fn EACH<A>(self: IMPL_T<A>, f: fn(A) -> bool) {
+fn EACH<A>(self: IMPL_T<A>, f: fn(A) -> bool) {
     import dlist::extensions;
 
     let mut link = self.peek_n();

trunk/src/libcore/iter-trait/option.rs

@@ -1,6 +1,6 @@
 type IMPL_T<A> = option<A>;
 
-pure fn EACH<A>(self: IMPL_T<A>, f: fn(A) -> bool) {
+fn EACH<A>(self: IMPL_T<A>, f: fn(A) -> bool) {
     alt self {
       none { }
       some(a) { f(a); }