Update to rust master

Author: alexcrichton

Cargo.lock

@@ -30,7 +30,7 @@ pub fn execute(options: Options, config: &Config) -> CliResult<Option<()>> {
     let token = match options.arg_token.clone() {
         Some(token) => token,
         None => {
-            let err = (|:| {
+            let err = (|| {
                 let src = try!(SourceId::for_central(config));
                 let mut src = RegistrySource::new(&src, config);
                 try!(src.update());

src/bin/login.rs

@@ -160,7 +160,7 @@ impl<'a, 'b> PackageRegistry<'a, 'b> {
     }
 
     fn load(&mut self, source_id: &SourceId, kind: Kind) -> CargoResult<()> {
-        (|:| {
+        (|| {
             let mut source = source_id.load(self.config);
 
             // Ensure the source has fetched all necessary remote data.

src/cargo/core/registry.rs

@@ -26,7 +26,7 @@ impl EncodableResolve {
         let packages = self.package.as_ref().unwrap_or(&packages);
 
         {
-            let mut register_pkg = |&mut: pkg: &EncodableDependency|
+            let mut register_pkg = |pkg: &EncodableDependency|
                                     -> CargoResult<()> {
                 let pkgid = try!(pkg.to_package_id(default));
                 let precise = pkgid.source_id().precise()
@@ -44,7 +44,7 @@ impl EncodableResolve {
         }
 
         {
-            let mut add_dependencies = |&mut: pkg: &EncodableDependency|
+            let mut add_dependencies = |pkg: &EncodableDependency|
                                         -> CargoResult<()> {
                 let package_id = try!(pkg.to_package_id(default));
 

src/cargo/core/resolver/encode.rs

@@ -182,7 +182,7 @@ impl GitDatabase {
     pub fn rev_for(&self, reference: &GitReference) -> CargoResult<GitRevision> {
         let id = match *reference {
             GitReference::Tag(ref s) => {
-                try!((|:| {
+                try!((|| {
                     let refname = format!("refs/tags/{}", s);
                     let id = try!(self.repo.refname_to_id(&refname));
                     let obj = try!(self.repo.find_object(id, None));
@@ -193,7 +193,7 @@ impl GitDatabase {
                 }))
             }
             GitReference::Branch(ref s) => {
-                try!((|:| {
+                try!((|| {
                     let b = try!(self.repo.find_branch(s, git2::BranchType::Local));
                     b.get().target().chain_error(|| {
                         human(format!("branch `{}` did not have a target", s))

src/cargo/sources/git/utils.rs

@@ -84,7 +84,7 @@ impl<'a, 'b> PathSource<'a, 'b> {
         let include = try!(pkg.manifest().include().iter()
                               .map(|p| parse(p)).collect::<Result<Vec<_>, _>>());
 
-        let mut filter = |&mut: p: &Path| {
+        let mut filter = |p: &Path| {
             let relative_path = p.path_relative_from(&root).unwrap();
             include.iter().any(|p| p.matches_path(&relative_path)) || {
                 include.len() == 0 &&

src/cargo/sources/path.rs

@@ -1 +1 @@
-2015-02-05
+2015-02-09

src/rustversion.txt

@@ -1585,23 +1585,23 @@ test!(transitive_dependencies_not_available {
             version = "0.0.1"
             authors = []
 
-            [dependencies.a]
+            [dependencies.aaaaa]
             path = "a"
         "#)
-        .file("src/main.rs", "extern crate b; extern crate a; fn main() {}")
+        .file("src/main.rs", "extern crate bbbbb; extern crate aaaaa; fn main() {}")
         .file("a/Cargo.toml", r#"
             [package]
-            name = "a"
+            name = "aaaaa"
             version = "0.0.1"
             authors = []
 
-            [dependencies.b]
+            [dependencies.bbbbb]
             path = "../b"
         "#)
-        .file("a/src/lib.rs", "extern crate b;")
+        .file("a/src/lib.rs", "extern crate bbbbb;")
         .file("b/Cargo.toml", r#"
             [package]
-            name = "b"
+            name = "bbbbb"
             version = "0.0.1"
             authors = []
         "#)
@@ -1610,8 +1610,8 @@ test!(transitive_dependencies_not_available {
     assert_that(p.cargo_process("build").arg("-v"),
                 execs().with_status(101)
                        .with_stderr("\
-[..] can't find crate for `b`
-[..] extern crate b; [..]
+[..] can't find crate for `bbbbb`
+[..] extern crate bbbbb; [..]
 [..]
 error: aborting due to previous error
 Could not compile `foo`.

tests/test_cargo_compile.rs

@@ -620,17 +620,17 @@ test!(build_deps_not_for_normal {
             version = "0.5.0"
             authors = []
             build = "build.rs"
-            [build-dependencies.a]
+            [build-dependencies.aaaaa]
             path = "a"
         "#)
-        .file("src/lib.rs", "extern crate a;")
+        .file("src/lib.rs", "extern crate aaaaa;")
         .file("build.rs", "
-            extern crate a;
+            extern crate aaaaa;
             fn main() {}
         ")
         .file("a/Cargo.toml", r#"
             [project]
-            name = "a"
+            name = "aaaaa"
             version = "0.5.0"
             authors = []
         "#)
@@ -639,9 +639,9 @@ test!(build_deps_not_for_normal {
     assert_that(p.cargo_process("build").arg("-v").arg("--target").arg(target),
                 execs().with_status(101)
                        .with_stderr("\
-[..]lib.rs[..] error: can't find crate for `a`
-[..]lib.rs[..] extern crate a;
-[..]           ^~~~~~~~~~~~~~~
+[..]lib.rs[..] error: can't find crate for `aaaaa`
+[..]lib.rs[..] extern crate aaaaa;
+[..]           ^~~~~~~~~~~~~~~~~~~
 error: aborting due to previous error
 Could not compile `foo`.