Merge pull request #3278 from erickt/incoming

A couple minor cleanups

Author: catamorphism

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()
     }

src/libstd/net_tcp.rs

@@ -153,7 +153,7 @@ fn connect(-input_ip: ip::ip_addr, port: uint,
           0i32 => {
             log(debug, ~"tcp_init successful");
             match input_ip {
-              ipv4 => {
+              _ipv4 => {
                 log(debug, ~"dealing w/ ipv4 connection..");
                 let connect_req_ptr =
                     ptr::addr_of((*socket_data_ptr).connect_req);

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(~": ");

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());
 }