Update to rust master

Author: alexcrichton

Cargo.lock

@@ -47,7 +47,7 @@ postgres = "0.4"
 curl = "0.1.0"
 oauth2 = "0.1.0"
 log = "0.1.0"
-rustc-serialize = "0.1"
+rustc-serialize = "0.2"
 
 conduit-conditional-get = "0.5.0"
 conduit-cookie = "0.1.0"

Cargo.toml

@@ -127,7 +127,7 @@ fn index_file(base: &Path, name: &str) -> Path {
 }
 
 pub fn add_crate(app: &App, krate: &Crate) -> CargoResult<()> {
-    let repo = app.git_repo.lock();
+    let repo = app.git_repo.lock().unwrap();
     let repo = &*repo;
     let repo_path = repo.path().dir_path();
     let dst = index_file(&repo_path, krate.name.as_slice());
@@ -151,7 +151,7 @@ pub fn add_crate(app: &App, krate: &Crate) -> CargoResult<()> {
 
 pub fn yank(app: &App, krate: &str, version: &semver::Version,
             yanked: bool) -> CargoResult<()> {
-    let repo = app.git_repo.lock();
+    let repo = app.git_repo.lock().unwrap();
     let repo = &*repo;
     let repo_path = repo.path().dir_path();
     let dst = index_file(&repo_path, krate);
@@ -237,7 +237,7 @@ fn commit_and_push(repo: &git2::Repository,
     Err(internal("Too many rebase failures"))
 }
 
-pub fn credentials(_user: &str, _user_from_url: Option<&str>,
+pub fn credentials(_user: &str, _user_from_url: &str,
                    _cred: git2::CredentialType)
                    -> Result<git2::Cred, git2::Error> {
     match (os::getenv("GIT_HTTP_USER"), os::getenv("GIT_HTTP_PWD")) {

src/git.rs

@@ -207,7 +207,7 @@ impl Crate {
             match license {
                 Some(license) => {
                     let ok = license.split('/').all(|l| {
-                        KNOWN_LICENSES.binary_search_elem(&l.trim()).found().is_some()
+                        KNOWN_LICENSES.binary_search(&l.trim()).is_ok()
                     });
                     if ok {
                         Ok(())

src/krate.rs

@@ -138,7 +138,7 @@ fn json<T>(r: &mut conduit::Response) -> T
            where T: rustc_serialize::Decodable<json::Decoder, json::DecoderError> {
     let data = r.body.read_to_end().unwrap();
     let s = std::str::from_utf8(data.as_slice()).unwrap();
-    let j = match json::from_str(s) {
+    let j = match Json::from_str(s) {
         Ok(t) => t,
         Err(e) => panic!("failed to decode: {}\n{}", e, s),
     };

src/tests/all.rs

@@ -1,5 +1,5 @@
 use std::collections::HashMap;
-use rustc_serialize::json;
+use rustc_serialize::json::Json;
 
 use conduit::{Handler, Request, Method};
 use semver;
@@ -65,7 +65,7 @@ fn authors() {
     ::mock_crate(&mut req, ::krate("foo"));
     let mut response = ok_resp!(middle.call(&mut req));
     let s = response.body.read_to_string().unwrap();
-    let json = json::from_str(s.as_slice()).unwrap();
+    let json = Json::from_str(s.as_slice()).unwrap();
     let json = json.as_object().unwrap();
     assert!(json.contains_key(&"users".to_string()));
 }