Update to rust master

Author: alexcrichton

Cargo.lock

@@ -33,7 +33,7 @@ fn env(s: &str) -> String {
 fn update(tx: &postgres::Transaction) -> postgres::Result<()> {
     let ids = os::args();
     let mut ids = ids.iter().skip(1).filter_map(|arg| {
-        from_str::<i32>(arg.as_slice())
+        arg.parse::<i32>()
     });
     for id in ids {
         let now = time::now_utc().to_timespec();

src/bin/populate.rs

@@ -61,8 +61,7 @@ fn main() {
     let port = if heroku {
         8888
     } else {
-        os::getenv("PORT").and_then(|s| from_str(s.as_slice()))
-                          .unwrap_or(8888)
+        os::getenv("PORT").and_then(|s| s.parse()).unwrap_or(8888)
     };
     let _a = Server::start(civet::Config { port: port, threads: 8 }, app);
     println!("listening on port {}", port);

src/bin/server.rs

@@ -24,7 +24,7 @@ fn main() {
         }
         drop(conn);
         if args.len() > 1 && args[1].as_slice() == "daemon" {
-            let sleep = from_str::<i64>(args[2].as_slice()).unwrap();
+            let sleep = args[2].parse::<i64>().unwrap();
             std::io::timer::sleep(Duration::seconds(sleep));
         } else {
             break