Update to rust master

Author: alexcrichton

Cargo.lock

@@ -50,7 +50,7 @@ url = "0.2.0"
 postgres = { version = "0.8", features = ["time"] }
 r2d2 = "0.5.0"
 r2d2_postgres = "0.9"
-openssl = "0.5"
+openssl = "0.6"
 curl = "0.2"
 oauth2 = "0.1"
 log = "0.3"

Cargo.toml

@@ -1 +1 @@
-2015-03-26
+2015-04-08

RUSTVERSION

@@ -5,15 +5,14 @@
 //      cargo run --bin populate version_id1 version_id2 ...
 
 #![deny(warnings)]
-#![feature(std_misc)]
 
 extern crate cargo_registry;
 extern crate postgres;
 extern crate time;
 extern crate rand;
 
 use std::env;
-use std::time::Duration;
+use time::Duration;
 use rand::{StdRng, Rng};
 
 fn main() {

src/bin/populate.rs

@@ -1,5 +1,4 @@
 #![deny(warnings)]
-#![feature(convert)]
 
 extern crate cargo_registry;
 extern crate conduit_middleware;

src/bin/server.rs

@@ -1,5 +1,4 @@
 #![deny(warnings)]
-#![feature(std_misc, thread_sleep)]
 
 extern crate cargo_registry;
 extern crate postgres;
@@ -8,7 +7,7 @@ extern crate time;
 
 use std::env;
 use std::collections::HashMap;
-use std::time::Duration;
+use time::Duration;
 
 use cargo_registry::{VersionDownload, Version, Model};
 
@@ -18,14 +17,14 @@ static LIMIT: i64 = 1000;
 fn main() {
     let daemon = env::args().nth(1).as_ref().map(|s| &s[..])
                     == Some("daemon");
-    let sleep = env::args().nth(2).map(|s| s.parse::<i64>().unwrap());
+    let sleep = env::args().nth(2).map(|s| s.parse::<u32>().unwrap());
     loop {
         let conn = postgres::Connection::connect(&env("DATABASE_URL")[..],
                                                  &postgres::SslMode::None).unwrap();
         update(&conn).unwrap();
         drop(conn);
         if daemon {
-            std::thread::sleep(Duration::seconds(sleep.unwrap()));
+            std::thread::sleep_ms(sleep.unwrap() * 1000);
         } else {
             break
         }

src/bin/update-downloads.rs

@@ -18,7 +18,7 @@ type PooledConnnection<'a> =
         r2d2::PooledConnection<'a, PostgresConnectionManager>;
 
 pub fn pool(url: &str, config: r2d2::Config) -> Pool {
-    let mgr = PostgresConnectionManager::new(url, pg::SslMode::None);
+    let mgr = PostgresConnectionManager::new(url, pg::SslMode::None).unwrap();
     r2d2::Pool::new(config, mgr, Box::new(LoggingErrorHandler)).unwrap()
 }
 

src/db.rs

@@ -1,5 +1,3 @@
-use std::num::FromPrimitive;
-
 use semver;
 
 use pg;
@@ -33,11 +31,15 @@ pub struct EncodableDependency {
     pub kind: Kind,
 }
 
-#[derive(FromPrimitive, Copy, Clone)]
+#[derive(Copy, Clone)]
+// NB: this order is important, it must be retained! The database stores an
+// integer corresponding to each variant.
 pub enum Kind {
     Normal,
     Build,
     Dev,
+
+    // if you add a kind here, be sure to update `from_row` below.
 }
 
 impl Dependency {
@@ -106,7 +108,12 @@ impl Model for Dependency {
             features: features.split(',').map(|s| s.to_string())
                               .collect(),
             target: row.get("target"),
-            kind: FromPrimitive::from_i32(kind.unwrap_or(0)).unwrap(),
+            kind: match kind.unwrap_or(0) {
+                0 => Kind::Normal,
+                1 => Kind::Build,
+                2 => Kind::Dev,
+                n => panic!("unknown kind: {}", n),
+            }
         }
     }
 

src/dependency.rs

@@ -10,7 +10,7 @@ use rustc_serialize::json;
 
 use app::App;
 use dependency::Kind;
-use util::{CargoResult, internal, ChainError};
+use util::{CargoResult, internal};
 
 #[derive(RustcEncodable, RustcDecodable)]
 pub struct Crate {
@@ -34,7 +34,7 @@ pub struct Dependency {
 }
 
 fn index_file(base: &Path, name: &str) -> PathBuf {
-    let name = name.to_lowercase();
+    let name = name.chars().flat_map(|c| c.to_lowercase()).collect::<String>();
     match name.len() {
         1 => base.join("1").join(&name),
         2 => base.join("2").join(&name),
@@ -141,9 +141,6 @@ fn commit_and_push<F>(repo: &git2::Repository, mut f: F) -> CargoResult<()>
 
             match push.finish() {
                 Ok(()) => {
-                    try!(push.statuses().chain_error(|| {
-                        internal("failed to update some remote refspecs")
-                    }));
                     try!(push.update_tips(None, None));
                     return Ok(())
                 }

src/git.rs

@@ -63,7 +63,7 @@ impl Keyword {
 
     pub fn valid_name(name: &str) -> bool {
         if name.len() == 0 { return false }
-        name.char_at(0).is_alphanumeric() &&
+        name.chars().next().unwrap().is_alphanumeric() &&
             name.chars().all(|c| c.is_alphanumeric() || c == '_' || c == '-') &&
             name.chars().all(|c| c.is_ascii())
     }