Rust update: The ToStr trait will be replaced wit Show

Author: Ogeon

src/codegen/status.rs

@@ -235,14 +235,6 @@ impl Status {
     }
 }
 
-impl ToStr for Status {
-    /// Produce the HTTP status message incorporating both code and message,
-    /// e.g. `ImATeapot.to_str() == \"418 I'm a teapot\"`
-	fn to_str(&self) -> ~str {
-		format!(\"{} {}\", self.code().to_str(), self.reason())
-	}
-}
-
 impl fmt::Show for Status {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f.buf, \"{} {}\", self.code(), self.reason())

src/http/headers/connection.rs

@@ -4,6 +4,7 @@
 // whether they should be interpreted (I recall its being a header name thing for legacy code,
 // perhaps I should normalise header case or some such thing?)
 
+use std::fmt;
 use std::io::IoResult;
 use headers::serialization_utils::normalise_header_name;
 
@@ -14,12 +15,13 @@ pub enum Connection {
     Token(~str),
     Close,
 }
-impl ToStr for Connection {
-    fn to_str(&self) -> ~str {
-        match *self {
-            Token(ref s) => s.clone(),
-            Close => ~"close",
-        }
+
+impl fmt::Show for Connection {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        f.buf.write(match *self {
+            Token(ref s) => s.as_bytes(),
+            Close => "close".as_bytes(),
+        })
     }
 }
 

src/http/headers/content_type.rs

@@ -1,6 +1,7 @@
 //! The Content-Type entity header, defined in RFC 2616, Section 14.17.
 use headers::serialization_utils::{push_parameters, WriterUtil};
 use std::io::IoResult;
+use std::fmt;
 
 #[deriving(Clone, Eq)]
 pub struct MediaType {
@@ -17,8 +18,8 @@ pub fn MediaType(type_: ~str, subtype: ~str, parameters: ~[(~str, ~str)]) -> Med
     }
 }
 
-impl ToStr for MediaType {
-    fn to_str(&self) -> ~str {
+impl fmt::Show for MediaType {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         // Idea:
         //let s = ~"";
         //s.push_token(self.type_);
@@ -27,7 +28,7 @@ impl ToStr for MediaType {
         //s.push_parameters(self.parameters);
         //s
         let s = format!("{}/{}", self.type_, self.subtype);
-        push_parameters(s, self.parameters)
+        f.buf.write(push_parameters(s, self.parameters).as_bytes())
     }
 }
 

src/http/headers/etag.rs

@@ -1,5 +1,6 @@
 use headers::serialization_utils::{push_quoted_string, quoted_string, WriterUtil};
 use std::io::IoResult;
+use std::fmt;
 
 #[deriving(Clone, Eq)]
 pub struct EntityTag {
@@ -21,12 +22,12 @@ pub fn strong_etag<S: Str>(opaque_tag: S) -> EntityTag {
     }
 }
 
-impl ToStr for EntityTag {
-    fn to_str(&self) -> ~str {
+impl fmt::Show for EntityTag {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         if self.weak {
-            push_quoted_string(~"W/", self.opaque_tag)
+            f.buf.write(push_quoted_string(~"W/", self.opaque_tag).as_bytes())
         } else {
-            quoted_string(self.opaque_tag)
+            f.buf.write(quoted_string(self.opaque_tag).as_bytes())
         }
     }
 }

src/http/headers/host.rs

@@ -1,6 +1,7 @@
 //! The Host request header, defined in RFC 2616, Section 14.23.
 
 use std::io::Reader;
+use std::fmt;
 
 /// A simple little thing for the host of a request
 #[deriving(Clone, Eq)]
@@ -14,11 +15,12 @@ pub struct Host {
     /// include the scheme.
     port: Option<u16>,
 }
-impl ToStr for Host {
-    fn to_str(&self) -> ~str {
+
+impl fmt::Show for Host {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self.port {
-            Some(port) => format!("{}:{}", self.name, port.to_str()),
-            None => self.name.clone(),
+            Some(port) => write!(f.buf, "{}:{}", self.name, port.to_str()),
+            None => f.buf.write(self.name.as_bytes()),
         }
     }
 }

src/http/method.rs

@@ -17,24 +17,6 @@ pub enum Method {
     ExtensionMethod(~str),
 }
 
-impl ToStr for Method {
-    /// Get the proper name of a method, e.g. `Get.to_str() == ~"GET"`
-    fn to_str(&self) -> ~str {
-        match *self {
-            Options                => ~"OPTIONS",
-            Get                    => ~"GET",
-            Head                   => ~"HEAD",
-            Post                   => ~"POST",
-            Put                    => ~"PUT",
-            Delete                 => ~"DELETE",
-            Trace                  => ~"TRACE",
-            Connect                => ~"CONNECT",
-            Patch                  => ~"PATCH",
-            ExtensionMethod(ref s) => (*s).clone(),
-        }
-    }
-}
-
 impl FromStr for Method {
     /**
      * Get a *known* `Method` from an *ASCII* string, regardless of case.

src/http/rfc2616.rs

@@ -141,6 +141,8 @@ pub fn is_separator(o: u8) -> bool {
 // see https://www.iana.org/assignments/http-parameters/http-parameters.xml
 
 mod content_coding {
+    use std::fmt;
+
     /// Content-coding value tokens
     pub enum ValueToken {
         // An encoding format produced by the file compression program "gzip" (GNU zip) as described
@@ -171,14 +173,14 @@ mod content_coding {
         // - "exi": W3C Efficient XML Interchange
         // - "pack200-gzip" (Network Transfer Format for Java Archives)
     }
-    impl ToStr for ValueToken {
-        fn to_str(&self) -> ~str {
-            match *self {
-                Gzip => ~"gzip",
-                Compress => ~"compress",
-                Deflate => ~"deflate",
-                Identity => ~"identity",
-            }
+    impl fmt::Show for ValueToken {
+        fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+            f.buf.write(match *self {
+                Gzip => "gzip".as_bytes(),
+                Compress => "compress".as_bytes(),
+                Deflate => "deflate".as_bytes(),
+                Identity => "identity".as_bytes(),
+            })
         }
     }
     impl FromStr for ValueToken {
@@ -196,6 +198,8 @@ mod content_coding {
 }
 
 mod transfer_coding {
+    use std::fmt;
+    
     /// Transfer-coding value tokens
     // Identity is in RFC 2616 but is withdrawn in RFC 2616 errata ID 408
     // http://www.rfc-editor.org/errata_search.php?rfc=2616&eid=408
@@ -205,14 +209,14 @@ mod transfer_coding {
         Compress,  // See above
         Deflate,   // See above
     }
-    impl ToStr for ValueToken {
-        fn to_str(&self) -> ~str {
-            match *self {
-                Chunked => ~"chunked",
-                Gzip => ~"gzip",
-                Compress => ~"compress",
-                Deflate => ~"deflate",
-            }
+    impl fmt::Show for ValueToken {
+        fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+            f.buf.write(match *self {
+                Chunked => "chunked".as_bytes(),
+                Gzip => "gzip".as_bytes(),
+                Compress => "compress".as_bytes(),
+                Deflate => "deflate".as_bytes(),
+            })
         }
     }
 }