Merge pull request #33 from mletterle/rust-updates

Idiomatic changes to allow rust-http to build on latest rust compiler

Author: chris-morgan

src/libhttp/codegen/branchify.rs

@@ -1,7 +1,6 @@
 #[macro_escape];
 
 use std::str::CharIterator;
-use std::rt::io::file::FileWriter;
 use std::rt::io::Writer;
 
 struct ParseBranch {
@@ -79,7 +78,7 @@ macro_rules! branchify(
 ///         replaced with an expression (literal or non-literal) evaluating to a ``~str`` (it is
 ///         ``{}`` only, not arbitrary format strings)
 pub fn generate_branchified_method(
-        writer: &mut FileWriter,
+        writer: &mut Writer,
         branches: &[ParseBranch],
         indent: uint,
         read_call: &str,
@@ -88,7 +87,7 @@ pub fn generate_branchified_method(
         valid: &str,
         unknown: &str) {
 
-    fn r(writer: &mut FileWriter, branch: &ParseBranch, prefix: &str, indent: uint, read_call: &str,
+    fn r(writer: &mut Writer, branch: &ParseBranch, prefix: &str, indent: uint, read_call: &str,
             end: &str, max_len: &str, valid: &str, unknown: &str) {
         let indentstr = " ".repeat(indent * 4);
         let w = |s: &str| {

src/libhttp/codegen/codegen.rs

@@ -1,23 +1,13 @@
 #[feature(macro_rules)];
 
 use std::rt::io::{Writer, CreateOrTruncate};
-use std::rt::io::file::{FileInfo, FileWriter};
+use std::rt::io::file::FileInfo;
 use std::os;
 
 pub mod branchify;
 pub mod status;
 pub mod read_method;
 
-trait WriterExtensions {
-    fn write_str(&mut self, msg: &str);
-}
-
-impl<T: Writer> WriterExtensions for T {
-    fn write_str(&mut self, msg: &str) {
-        self.write(msg.as_bytes());
-    }
-}
-
 fn main() {
     let args = os::args();
     match args.len() {
@@ -46,11 +36,11 @@ fn main() {
     }
 }
 
-pub fn get_writer(output_dir: &Path, filename: &str) -> FileWriter {
+pub fn get_writer(output_dir: &Path, filename: &str) -> ~Writer {
     let mut output_file = output_dir.clone();
     output_file.push(filename);
     match output_file.open_writer(CreateOrTruncate) {
-        Some(writer) => writer,
+        Some(writer) => ~writer as ~Writer,
         None => fail!("Unable to write file"),
     }
 }

src/libhttp/codegen/read_method.rs

@@ -1,5 +1,6 @@
 use super::branchify::generate_branchified_method;
 use super::get_writer;
+use std::rt::io::Writer;
 
 pub fn generate(output_dir: &Path) {
     let mut writer = get_writer(output_dir, "read_method.rs");
@@ -13,7 +14,7 @@ pub fn generate(output_dir: &Path) {
 "));
 
     generate_branchified_method(
-        &mut writer,
+        writer,
         branchify!(case sensitive,
             "CONNECT" => Connect,
             "DELETE"  => Delete,

src/libhttp/codegen/status.rs

@@ -11,6 +11,7 @@ use std::ascii::StrAsciiExt;
 use std::hashmap::HashSet;
 use std::either::{Either, Left, Right};
 use std::vec;
+use std::rt::io::Writer;
 use super::get_writer;
 
 type HeadingOrStatus = Either<&'static str, Status>;
@@ -154,26 +155,26 @@ pub fn generate(output_dir: &Path) {
             Right(status) => status.reason.len(),
         }).max_by(|&i| i).unwrap();
     }
-    out.write_str("// This file is automatically generated file is used as http::status.
+    out.write("// This file is automatically generated file is used as http::status.
 
 use std::fmt;
 use std::ascii::StrAsciiExt;
 
 /// HTTP status code
 #[deriving(Eq)]
 pub enum Status {
-");
+".as_bytes());
     for &entry in entries.iter() {
         match entry {
-            Left(heading) => out.write_str(format!("\n    // {}\n", heading)),
+            Left(heading) => write!(out, "\n    // {}\n", heading),
             Right(status) => match status.comment {
-                None => out.write_str(format!("    {},\n", status.ident())),
-                Some(comment) => out.write_str(format!("    {},  // {}\n", status.ident(), comment)),
+                None => write!(out, "    {},\n", status.ident()),
+                Some(comment) => write!(out, "    {},  // {}\n", status.ident(), comment),
             },
         }
     }
 
-    out.write_str("
+    out.write("
     UnregisteredStatus(u16, ~str),
 }
 
@@ -182,31 +183,31 @@ impl Status {
     /// Get the status code
     pub fn code(&self) -> u16 {
         match *self {
-");
+".as_bytes());
     for &entry in entries.iter() {
         match entry {
-            Left(heading) => out.write_str(format!("\n            // {}\n", heading)),
-            Right(status) => out.write_str(format!("            {} => {},\n",
-                                                status.padded_ident(), status.code)),
+            Left(heading) => write!(out, "\n            // {}\n", heading),
+            Right(status) => write!(out, "            {} => {},\n",
+                                                status.padded_ident(), status.code),
         }
     }
-    out.write_str("
+    out.write("
             UnregisteredStatus(code, _)   => code,
         }
     }
 
     /// Get the reason phrase
     pub fn reason(&self) -> ~str {
         match *self {
-");
+".as_bytes());
     for &entry in entries.iter() {
         match entry {
-            Left(heading) => out.write_str(format!("\n            // {}\n", heading)),
-            Right(status) => out.write_str(format!("            {} => ~\"{}\",\n",
-                                                status.padded_ident(), status.reason))
+            Left(heading) => write!(out, "\n            // {}\n", heading),
+            Right(status) => write!(out, "            {} => ~\"{}\",\n",
+                                                status.padded_ident(), status.reason)
         }
     }
-    out.write_str("
+    out.write("
             UnregisteredStatus(_, ref reason) => (*reason).clone(),
         }
     }
@@ -215,18 +216,18 @@ impl Status {
     pub fn from_code_and_reason(status: u16, reason: ~str) -> Status {
         let reason_lower = reason.to_ascii_lower();
         match (status, reason_lower.as_slice()) {
-");
+".as_bytes());
     for &entry in entries.iter() {
         match entry {
-            Left(heading) => out.write_str(format!("\n            // {}\n", heading)),
-            Right(status) => out.write_str(format!("            ({}, \"{}\"){} => {},\n",
+            Left(heading) => write!(out, "\n            // {}\n", heading),
+            Right(status) => write!(out, "            ({}, \"{}\"){} => {},\n",
                                                 status.code,
                                                 status.reason.to_ascii_lower(),
                                                 status.reason_padding_spaces(),
-                                                status.ident())),
+                                                status.ident()),
         }
     }
-    out.write_str("
+    out.write("
             (_, _) => UnregisteredStatus(status, reason),
         }
     }
@@ -287,24 +288,24 @@ impl FromPrimitive for Status {
     /// For example, `from_u64(200)` will return `OK`.
     fn from_u64(n: u64) -> Option<Status> {
         Some(match n {
-");
+".as_bytes());
     let mut matched_numbers = HashSet::new();
     for &entry in entries.iter() {
         match entry {
-            Left(heading) => out.write_str(format!("\n            // {}\n", heading)),
+            Left(heading) => write!(out, "\n            // {}\n", heading),
             Right(status) => {
                 if !matched_numbers.contains(&status.code) {
                     // Purpose: FailedDependency and MethodFailure both use 424,
                     // but clearly they mustn't both go in here
-                    out.write_str(format!("            {:u} => {},\n", status.code, status.ident()));
+                    write!(out, "            {:u} => {},\n", status.code, status.ident());
                     matched_numbers.insert(status.code);
                 }
             },
         }
     }
-    out.write_str("
+    out.write("
             _   => { return None }
         })
     }
-}");
+}".as_bytes());
 }