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())
     }

src/keyword.rs

@@ -6,7 +6,6 @@ use std::io;
 use std::iter::repeat;
 use std::mem;
 use std::sync::Arc;
-use std::time::Duration;
 
 use conduit::{Request, Response};
 use conduit_router::RequestParams;
@@ -16,7 +15,7 @@ use pg;
 use rustc_serialize::hex::ToHex;
 use rustc_serialize::json;
 use semver;
-use time::Timespec;
+use time::{Timespec, Duration};
 use url::{self, Url};
 
 use {Model, User, Keyword, Version};
@@ -224,7 +223,7 @@ impl Crate {
 
     pub fn valid_name(name: &str) -> bool {
         if name.len() == 0 { return false }
-        name.char_at(0).is_alphabetic() &&
+        name.chars().next().unwrap().is_alphabetic() &&
             name.chars().all(|c| c.is_alphanumeric() || c == '_' || c == '-') &&
             name.chars().all(|c| c.is_ascii())
     }
@@ -448,7 +447,7 @@ pub fn index(req: &mut Request) -> CargoResult<Response> {
           WHERE q @@ textsearchable_index_col".to_string())
     }).or_else(|| {
         query.get("letter").map(|letter| {
-            pattern = format!("{}%", letter.char_at(0)
+            pattern = format!("{}%", letter.chars().next().unwrap()
                                            .to_lowercase().collect::<String>());
             needs_pattern = true;
             (format!("SELECT * FROM crates WHERE canon_crate_name(name) \
@@ -777,7 +776,7 @@ fn read_fill<R: Read + ?Sized>(r: &mut R, mut slice: &mut [u8])
         let n = try!(r.read(slice));
         if n == 0 {
             return Err(io::Error::new(io::ErrorKind::Other,
-                                      "end of file reached", None))
+                                      "end of file reached"))
         }
         slice = &mut mem::replace(&mut slice, &mut [])[n..];
     }

src/krate.rs

@@ -1,5 +1,3 @@
-#![feature(collections, core, std_misc, io, str_char)]
-
 #[macro_use] extern crate log;
 extern crate postgres as pg;
 extern crate rustc_serialize;

src/lib.rs

@@ -4,13 +4,13 @@ name = "s3"
 version = "0.0.1"
 authors = []
 
-[[lib]]
+[lib]
 
 name = "s3"
 path = "lib.rs"
 
 [dependencies]
-openssl = "0.5"
+openssl = "0.6"
 time = "0.1.0"
 curl = "0.2"
 rustc-serialize = "0.3"

src/s3/Cargo.toml

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

src/tests/all.rs

@@ -109,10 +109,26 @@ impl<E: CargoError> fmt::Display for ChainedError<E> {
 
 impl<E: Error + Send + 'static> From<E> for Box<CargoError> {
     fn from(err: E) -> Box<CargoError> {
-        Box::new(err)
+        struct Shim<E>(E);
+        impl<E: Error + Send + 'static> CargoError for Shim<E> {
+            fn description(&self) -> &str { Error::description(&self.0) }
+        }
+        impl<E: fmt::Display> fmt::Display for Shim<E> {
+            fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+                self.0.fmt(f)
+            }
+        }
+        Box::new(Shim(err))
     }
 }
 
+impl CargoError for ::curl::ErrCode {
+    fn description(&self) -> &str { Error::description(self) }
+}
+impl CargoError for ::rustc_serialize::json::DecoderError {
+    fn description(&self) -> &str { Error::description(self) }
+}
+
 // =============================================================================
 // Concrete errors
 

src/util/errors.rs

@@ -16,7 +16,7 @@ impl<R: Read> Read for LimitErrorReader<R> {
         match self.inner.read(buf) {
             Ok(0) if self.inner.limit() == 0 => {
                 Err(io::Error::new(io::ErrorKind::Other,
-                                   "maximum limit reached when reading", None))
+                                   "maximum limit reached when reading"))
             }
             e => e,
         }

src/util/io_util.rs

@@ -1,13 +1,13 @@
 use std::collections::HashMap;
-use std::time::Duration;
 use rustc_serialize::json;
 use time::Timespec;
 
 use conduit::{Request, Response};
 use conduit_router::RequestParams;
-use pg;
 use pg::types::Slice;
+use pg;
 use semver;
+use time::Duration;
 use url;
 
 use {Model, Crate, User};