Update to rust master

Author: alexcrichton

Cargo.lock

@@ -7,7 +7,7 @@ version = "0.1.0"
 opt-level = 2
 
 [lib]
-name = "cargo-registry"
+name = "cargo_registry"
 test = false
 doctest = false
 
@@ -41,7 +41,7 @@ path = "src/tests/all.rs"
 [dependencies]
 s3 = { path = "src/s3" }
 migrate = { path = "src/migrate" }
-rand = "0.2"
+rand = "0.3"
 time = "0.1"
 git2 = "0.2"
 flate2 = "0.2"
@@ -53,8 +53,8 @@ r2d2_postgres = "0.8"
 openssl = "0.5"
 curl = "0.2"
 oauth2 = "0.1"
-log = "0.2"
-env_logger = "0.2"
+log = "0.3"
+env_logger = "0.3"
 rustc-serialize = "0.3"
 
 conduit = "0.7"

Cargo.toml

@@ -1 +1 @@
-2015-03-23
+2015-03-26

RUSTVERSION

@@ -29,8 +29,8 @@ pub struct AppMiddleware {
 impl App {
     pub fn new(config: &Config) -> App {
         let github = oauth2::Config::new(
-            config.gh_client_id.as_slice(),
-            config.gh_client_secret.as_slice(),
+            &config.gh_client_id,
+            &config.gh_client_secret,
             "https://github.com/login/oauth/authorize",
             "https://github.com/login/oauth/access_token",
         );
@@ -42,7 +42,7 @@ impl App {
 
         let repo = git2::Repository::open(&config.git_repo_checkout).unwrap();
         return App {
-            database: db::pool(config.db_url.as_slice(), db_config),
+            database: db::pool(&config.db_url, db_config),
             github: github,
             bucket: s3::Bucket::new(config.s3_bucket.clone(),
                                     config.s3_region.clone(),
@@ -71,12 +71,12 @@ impl Middleware for AppMiddleware {
     }
 }
 
-pub trait RequestApp<'a> {
-    fn app(self) -> &'a Arc<App>;
+pub trait RequestApp {
+    fn app(&self) -> &Arc<App>;
 }
 
-impl<'a> RequestApp<'a> for &'a (Request + 'a) {
-    fn app(self) -> &'a Arc<App> {
+impl<'a> RequestApp for Request + 'a {
+    fn app(&self) -> &Arc<App> {
         self.extensions().find::<Arc<App>>()
             .expect("Missing app")
     }

src/app.rs

@@ -6,10 +6,9 @@
 //      cargo run --bin delete-crate crate-name
 
 #![deny(warnings)]
-#![feature(core)]
 
 #[macro_use]
-extern crate "cargo-registry" as cargo_registry;
+extern crate cargo_registry;
 extern crate postgres;
 extern crate time;
 
@@ -19,7 +18,7 @@ use std::io;
 use cargo_registry::Crate;
 
 fn main() {
-    let conn = postgres::Connection::connect(env("DATABASE_URL").as_slice(),
+    let conn = postgres::Connection::connect(&env("DATABASE_URL")[..],
                                              &postgres::SslMode::None).unwrap();
     {
         let tx = conn.transaction().unwrap();
@@ -42,7 +41,7 @@ fn delete(tx: &postgres::Transaction) {
         Some(s) => s,
     };
 
-    let krate = Crate::find_by_name(tx, name.as_slice()).unwrap();
+    let krate = Crate::find_by_name(tx, &name).unwrap();
     print!("Are you sure you want to delete {} ({}) [y/N]: ", name, krate.id);
     let mut line = String::new();
     io::stdin().read_line(&mut line).unwrap();

src/bin/delete-crate.rs

@@ -6,9 +6,8 @@
 //      cargo run --bin delete-version crate-name version-number
 
 #![deny(warnings)]
-#![feature(core)]
 
-extern crate "cargo-registry" as cargo_registry;
+extern crate cargo_registry;
 extern crate postgres;
 extern crate time;
 extern crate semver;
@@ -19,7 +18,7 @@ use std::io;
 use cargo_registry::{Crate, Version};
 
 fn main() {
-    let conn = postgres::Connection::connect(env("DATABASE_URL").as_slice(),
+    let conn = postgres::Connection::connect(&env("DATABASE_URL")[..],
                                              &postgres::SslMode::None).unwrap();
     {
         let tx = conn.transaction().unwrap();
@@ -47,7 +46,7 @@ fn delete(tx: &postgres::Transaction) {
     };
     let version = semver::Version::parse(&version).unwrap();
 
-    let krate = Crate::find_by_name(tx, name.as_slice()).unwrap();
+    let krate = Crate::find_by_name(tx, &name).unwrap();
     let v = Version::find_by_num(tx, krate.id, &version).unwrap().unwrap();
     print!("Are you sure you want to delete {}#{} ({}) [y/N]: ", name, version,
            v.id);

src/bin/delete-version.rs

@@ -1,7 +1,7 @@
 #![deny(warnings)]
 #![feature(core)]
 
-extern crate "cargo-registry" as cargo_registry;
+extern crate cargo_registry;
 extern crate migrate;
 extern crate postgres;
 
@@ -13,7 +13,7 @@ use cargo_registry::krate::Crate;
 use cargo_registry::model::Model;
 
 fn main() {
-    let conn = postgres::Connection::connect(env("DATABASE_URL").as_slice(),
+    let conn = postgres::Connection::connect(&env("DATABASE_URL")[..],
                                              &postgres::SslMode::None).unwrap();
     let migrations = migrations();
 
@@ -74,10 +74,10 @@ fn migrations() -> Vec<Migration> {
             num             VARCHAR NOT NULL
         "),
         Migration::run(20140924115329,
-                       format!("ALTER TABLE versions ADD CONSTRAINT \
-                                unique_num UNIQUE (package_id, num)"),
-                       format!("ALTER TABLE versions DROP CONSTRAINT \
-                                unique_num")),
+                       &format!("ALTER TABLE versions ADD CONSTRAINT \
+                                 unique_num UNIQUE (package_id, num)"),
+                       &format!("ALTER TABLE versions DROP CONSTRAINT \
+                                 unique_num")),
         Migration::add_table(20140924120803, "version_dependencies", "
             version_id      INTEGER NOT NULL,
             depends_on_id   INTEGER NOT NULL
@@ -466,7 +466,7 @@ fn migrations() -> Vec<Migration> {
                           table = table, col = column, reference = references);
         let rm = format!("ALTER TABLE {table} DROP CONSTRAINT fk_{table}_{col}",
                           table = table, col = column);
-        Migration::run(id, add.as_slice(), rm.as_slice())
+        Migration::run(id, &add, &rm)
     }
 
     fn index(id: i64, table: &str, column: &str) -> Migration {
@@ -475,7 +475,7 @@ fn migrations() -> Vec<Migration> {
                           table = table, column = column);
         let rm = format!("DROP INDEX index_{table}_{column}",
                          table = table, column = column);
-        Migration::run(id, add.as_slice(), rm.as_slice())
+        Migration::run(id, &add, &rm)
     }
 }
 

src/bin/migrate.rs

@@ -5,9 +5,9 @@
 //      cargo run --bin populate version_id1 version_id2 ...
 
 #![deny(warnings)]
-#![feature(core, std_misc)]
+#![feature(std_misc)]
 
-extern crate "cargo-registry" as cargo_registry;
+extern crate cargo_registry;
 extern crate postgres;
 extern crate time;
 extern crate rand;
@@ -17,7 +17,7 @@ use std::time::Duration;
 use rand::{StdRng, Rng};
 
 fn main() {
-    let conn = postgres::Connection::connect(env("DATABASE_URL").as_slice(),
+    let conn = postgres::Connection::connect(&env("DATABASE_URL")[..],
                                              &postgres::SslMode::None).unwrap();
     {
         let tx = conn.transaction().unwrap();

src/bin/populate.rs

@@ -1,8 +1,8 @@
 #![deny(warnings)]
-#![feature(core)]
+#![feature(convert)]
 
-extern crate "cargo-registry" as cargo_registry;
-extern crate "conduit-middleware" as conduit_middleware;
+extern crate cargo_registry;
+extern crate conduit_middleware;
 extern crate civet;
 extern crate git2;
 extern crate env_logger;
@@ -17,7 +17,7 @@ use std::sync::mpsc::channel;
 fn main() {
     env_logger::init().unwrap();
     let url = env("GIT_REPO_URL");
-    let checkout = PathBuf::new(&env("GIT_REPO_CHECKOUT"));
+    let checkout = PathBuf::from(env("GIT_REPO_CHECKOUT"));
 
     let repo = match git2::Repository::open(&checkout) {
         Ok(r) => r,
@@ -28,7 +28,7 @@ fn main() {
             cb.credentials(cargo_registry::git::credentials);
             git2::build::RepoBuilder::new()
                                      .remote_callbacks(cb)
-                                     .clone(url.as_slice(), &checkout).unwrap()
+                                     .clone(&url, &checkout).unwrap()
         }
     };
     let mut cfg = repo.config().unwrap();

src/bin/server.rs

@@ -1,7 +1,7 @@
 #![deny(warnings)]
-#![feature(std_misc, core, old_io)]
+#![feature(std_misc, thread_sleep)]
 
-extern crate "cargo-registry" as cargo_registry;
+extern crate cargo_registry;
 extern crate postgres;
 extern crate semver;
 extern crate time;
@@ -20,7 +20,7 @@ fn main() {
                     == Some("daemon");
     let sleep = env::args().nth(2).map(|s| s.parse::<i64>().unwrap());
     loop {
-        let conn = postgres::Connection::connect(env("DATABASE_URL").as_slice(),
+        let conn = postgres::Connection::connect(&env("DATABASE_URL")[..],
                                                  &postgres::SslMode::None).unwrap();
         {
             let tx = conn.transaction().unwrap();
@@ -32,7 +32,7 @@ fn main() {
         if daemon {
             #[allow(deprecated)]
             fn do_sleep(sleep: Option<i64>) {
-                std::old_io::timer::sleep(Duration::seconds(sleep.unwrap()));
+                std::thread::sleep(Duration::seconds(sleep.unwrap()));
             }
             do_sleep(sleep);
         } else {
@@ -142,7 +142,7 @@ mod test {
     use cargo_registry::{Version, Crate, User};
 
     fn conn() -> postgres::Connection {
-        postgres::Connection::connect(::env("TEST_DATABASE_URL").as_slice(),
+        postgres::Connection::connect(&::env("TEST_DATABASE_URL")[..],
                                       &postgres::SslMode::None).unwrap()
     }
 

src/bin/update-downloads.rs

@@ -88,7 +88,7 @@ impl Transaction {
         }
         let tx = self.tx.borrow();
         let tx: &'a pg::Transaction<'static> = tx.unwrap();
-        Ok(tx as &Connection)
+        Ok(tx)
     }
 
     pub fn rollback(&self) { self.commit.set(false); }
@@ -120,44 +120,44 @@ impl Middleware for TransactionMiddleware {
     }
 }
 
-pub trait RequestTransaction<'a> {
+pub trait RequestTransaction {
     /// Return the lazily initialized postgres connection for this request.
     ///
     /// The connection will live for the lifetime of the request.
-    fn db_conn(self) -> CargoResult<&'a pg::Connection>;
+    fn db_conn(&self) -> CargoResult<&pg::Connection>;
 
     /// Return the lazily initialized postgres transaction for this request.
     ///
     /// The transaction will live for the duration of the request, and it will
     /// only be set to commit() if a successful response code of 200 is seen.
-    fn tx(self) -> CargoResult<&'a (Connection + 'a)>;
+    fn tx(&self) -> CargoResult<&Connection>;
 
     /// Flag the transaction to not be committed
-    fn rollback(self);
+    fn rollback(&self);
     /// Flag this transaction to be committed
-    fn commit(self);
+    fn commit(&self);
 }
 
-impl<'a> RequestTransaction<'a> for &'a (Request + 'a) {
-    fn db_conn(self) -> CargoResult<&'a pg::Connection> {
+impl<'a> RequestTransaction for Request + 'a {
+    fn db_conn(&self) -> CargoResult<&pg::Connection> {
         self.extensions().find::<Transaction>()
             .expect("Transaction not present in request")
             .conn()
     }
 
-    fn tx(self) -> CargoResult<&'a (Connection + 'a)> {
+    fn tx(&self) -> CargoResult<&Connection> {
         self.extensions().find::<Transaction>()
             .expect("Transaction not present in request")
             .tx()
     }
 
-    fn rollback(self) {
+    fn rollback(&self) {
         self.extensions().find::<Transaction>()
             .expect("Transaction not present in request")
             .rollback()
     }
 
-    fn commit(self) {
+    fn commit(&self) {
         self.extensions().find::<Transaction>()
             .expect("Transaction not present in request")
             .commit()

src/db.rs

@@ -84,7 +84,7 @@ impl Dependency {
             req: req.to_string(),
             optional: optional,
             default_features: default_features,
-            features: features.as_slice().connect(","),
+            features: features.connect(","),
             target: target,
             kind: kind,
         }
@@ -100,10 +100,10 @@ impl Model for Dependency {
             id: row.get("id"),
             version_id: row.get("version_id"),
             crate_id: row.get("crate_id"),
-            req: semver::VersionReq::parse(req.as_slice()).unwrap(),
+            req: semver::VersionReq::parse(&req).unwrap(),
             optional: row.get("optional"),
             default_features: row.get("default_features"),
-            features: features.as_slice().split(',').map(|s| s.to_string())
+            features: features.split(',').map(|s| s.to_string())
                               .collect(),
             target: row.get("target"),
             kind: FromPrimitive::from_i32(kind.unwrap_or(0)).unwrap(),

src/dependency.rs

@@ -49,7 +49,7 @@ pub fn add_crate(app: &App, krate: &Crate) -> CargoResult<()> {
     let repo = app.git_repo.lock().unwrap();
     let repo = &*repo;
     let repo_path = repo.workdir().unwrap();
-    let dst = index_file(&repo_path, krate.name.as_slice());
+    let dst = index_file(&repo_path, &krate.name);
 
     commit_and_push(repo, || {
         // Add the crate to its relevant file
@@ -128,8 +128,7 @@ fn commit_and_push<F>(repo: &git2::Repository, mut f: F) -> CargoResult<()>
         let head = try!(repo.head());
         let parent = try!(repo.find_commit(head.target().unwrap()));
         let sig = try!(repo.signature());
-        try!(repo.commit(Some("HEAD"), &sig, &sig, msg.as_slice(),
-                         &tree, &[&parent]));
+        try!(repo.commit(Some("HEAD"), &sig, &sig, &msg, &tree, &[&parent]));
 
         // git push
         let mut callbacks = git2::RemoteCallbacks::new();
@@ -168,7 +167,7 @@ pub fn credentials(_user: &str, _user_from_url: Option<&str>,
                    -> Result<git2::Cred, git2::Error> {
     match (env::var("GIT_HTTP_USER"), env::var("GIT_HTTP_PWD")) {
         (Ok(u), Ok(p)) => {
-            git2::Cred::userpass_plaintext(u.as_slice(), p.as_slice())
+            git2::Cred::userpass_plaintext(&u, &p)
         }
         _ => Err(git2::Error::from_str("no authentication set"))
     }