Merge pull request #114 from marcusklaas/rustup

Rustup

Author: nrc

Cargo.lock

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #![cfg(not(test))]
-#![feature(exit_status)]
 
 extern crate rustfmt;
 
@@ -24,28 +23,7 @@ fn main() {
     let mut def_config = String::new();
     def_config_file.read_to_string(&mut def_config).unwrap();
 
-    //run(args, WriteMode::Display, &def_config);
     run(args, WriteMode::Overwrite, &def_config);
 
-    std::env::set_exit_status(0);
-
-    // TODO unit tests
-    // let fmt = ListFormatting {
-    //     tactic: ListTactic::Horizontal,
-    //     separator: ",",
-    //     trailing_separator: SeparatorTactic::Vertical,
-    //     indent: 2,
-    //     h_width: 80,
-    //     v_width: 100,
-    // };
-    // let inputs = vec![(format!("foo"), String::new()),
-    //                   (format!("foo"), String::new()),
-    //                   (format!("foo"), String::new()),
-    //                   (format!("foo"), String::new()),
-    //                   (format!("foo"), String::new()),
-    //                   (format!("foo"), String::new()),
-    //                   (format!("foo"), String::new()),
-    //                   (format!("foo"), String::new())];
-    // let s = write_list(&inputs, &fmt);
-    // println!("  {}", s);
+    std::process::exit(0);
 }

src/bin/rustfmt.rs

@@ -9,7 +9,7 @@
 // except according to those terms.
 
 #![feature(rustc_private)]
-#![feature(collections)]
+#![feature(str_escape)]
 #![feature(str_char)]
 
 // TODO we're going to allocate a whole bunch of temp Strings, is it worth