---

yaml
---
r: 23492
b: refs/heads/master
c: f2f0ac9
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: bb5c07922f20559af1e40d63a15b1be0402e5fe4
+refs/heads/master: f2f0ac9fe051af0a52408984c39f0a97fd11dbf3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libstd/ebml.rs

@@ -320,7 +320,7 @@ enum ebml_serializer_tag {
 
 trait serializer_priv {
     fn _emit_tagged_uint(t: ebml_serializer_tag, v: uint);
-    fn _emit_label(label: ~str);
+    fn _emit_label(label: &str);
 }
 
 impl ebml::writer: serializer_priv {
@@ -330,7 +330,7 @@ impl ebml::writer: serializer_priv {
         self.wr_tagged_u32(t as uint, v as u32);
     }
 
-    fn _emit_label(label: ~str) {
+    fn _emit_label(label: &str) {
         // There are various strings that we have access to, such as
         // the name of a record field, which do not actually appear in
         // the serialized EBML (normally).  This is just for
@@ -365,11 +365,11 @@ impl ebml::writer: serialization::serializer {
 
     fn emit_str(v: &str) { self.wr_tagged_str(es_str as uint, v) }
 
-    fn emit_enum(name: ~str, f: fn()) {
+    fn emit_enum(name: &str, f: fn()) {
         self._emit_label(name);
         self.wr_tag(es_enum as uint, f)
     }
-    fn emit_enum_variant(_v_name: ~str, v_id: uint, _cnt: uint, f: fn()) {
+    fn emit_enum_variant(_v_name: &str, v_id: uint, _cnt: uint, f: fn()) {
         self._emit_tagged_uint(es_enum_vid, v_id);
         self.wr_tag(es_enum_body as uint, f)
     }
@@ -389,7 +389,7 @@ impl ebml::writer: serialization::serializer {
     fn emit_box(f: fn()) { f() }
     fn emit_uniq(f: fn()) { f() }
     fn emit_rec(f: fn()) { f() }
-    fn emit_rec_field(f_name: ~str, _f_idx: uint, f: fn()) {
+    fn emit_rec_field(f_name: &str, _f_idx: uint, f: fn()) {
         self._emit_label(f_name);
         f()
     }

trunk/src/libstd/prettyprint.rs

@@ -67,11 +67,11 @@ impl Writer: serializer {
         self.write_str(fmt!("%?", v));
     }
 
-    fn emit_enum(_name: ~str, f: fn()) {
+    fn emit_enum(_name: &str, f: fn()) {
         f();
     }
 
-    fn emit_enum_variant(v_name: ~str, _v_id: uint, sz: uint, f: fn()) {
+    fn emit_enum_variant(v_name: &str, _v_id: uint, sz: uint, f: fn()) {
         self.write_str(v_name);
         if sz > 0u { self.write_str(~"("); }
         f();
@@ -110,7 +110,7 @@ impl Writer: serializer {
         self.write_str(~"}");
     }
 
-    fn emit_rec_field(f_name: ~str, f_idx: uint, f: fn()) {
+    fn emit_rec_field(f_name: &str, f_idx: uint, f: fn()) {
         if f_idx > 0u { self.write_str(~", "); }
         self.write_str(f_name);
         self.write_str(~": ");

trunk/src/libstd/serialization.rs

@@ -26,15 +26,15 @@ trait serializer {
     fn emit_str(v: &str);
 
     // Compound types:
-    fn emit_enum(name: ~str, f: fn());
-    fn emit_enum_variant(v_name: ~str, v_id: uint, sz: uint, f: fn());
+    fn emit_enum(name: &str, f: fn());
+    fn emit_enum_variant(v_name: &str, v_id: uint, sz: uint, f: fn());
     fn emit_enum_variant_arg(idx: uint, f: fn());
     fn emit_vec(len: uint, f: fn());
     fn emit_vec_elt(idx: uint, f: fn());
     fn emit_box(f: fn());
     fn emit_uniq(f: fn());
     fn emit_rec(f: fn());
-    fn emit_rec_field(f_name: ~str, f_idx: uint, f: fn());
+    fn emit_rec_field(f_name: &str, f_idx: uint, f: fn());
     fn emit_tup(sz: uint, f: fn());
     fn emit_tup_elt(idx: uint, f: fn());
 }