Squashed 'cargo/' changes from b4665f7..fb9916f

fb9916f Merge branch 'master' of https://github.com/rust-lang/cargo
59238e8 Auto merge of #2575 - alexcrichton:bump, r=alexcrichton
1f889f7 Bump to 0.11.0
81debdd Auto merge of #2574 - alexcrichton:crates-io-bump, r=alexcrichton
5d87c4f Bump the crates-io crate to 0.2
88e3081 Auto merge of #2562 - smaximov:doc-add-env-vars, r=alexcrichton
2ef6fcb Add reference to env vars introduced in PR #2523 to the docs
4e1ffb1 Auto merge of #2561 - alexcrichton:update-tar, r=alexcrichton
11a0a31 Update dependency on tar
10ddd7d Auto merge of #2554 - alexcrichton:robust-test, r=alexcrichton
bc8e332 Make a test a bit more robust to the environment
34a7a06 Auto merge of #2465 - TheNeikos:add-version_env, r=alexcrichton
dd26ce3 Add a new CARGO_PKG_AUTHORS environment variable
31214eb Auto merge of #2385 - alexcrichton:top-level-overrides, r=wycats
f20ca62 Auto merge of #2547 - alexcrichton:more-locking, r=brson
6f6d7c8 Protect against concurrent access to Cargo.lock
a9fd1c2 Change `Config::target_dir` to return Filesystem
12f76a5 Auto merge of #2541 - alexcrichton:aarch64, r=alexcrichton
0f317c5 Download the aarch64 standard library on the bots
db60a09 Auto merge of #2534 - alexcrichton:lock-with-git-repos, r=brson
72690ba Auto merge of #2538 - alexcrichton:aarch64, r=alexcrichton
0a146ef Prepare for aarch64 nightlies and CI
fa7805a Auto merge of #2505 - srinivasreddy:improve_msg, r=alexcrichton
c63bbc6 remote unnecessary expression
fae9c53 Auto merge of #2491 - JIghtuse:master, r=alexcrichton
01cc9e1 Generate the lock file when there is no lock file
18e5930 Replace existing sources before updating
1a6a32e Auto merge of #2532 - japaric:musl, r=alexcrichton
d38f03b Auto merge of #2531 - alexcrichton:fix-stdin, r=alexcrichton
99c517b Update Rust to pick up rust-lang/rust#32257
d382d6a install-deps.py: add x86_64-unknown-linux-musl target
abdc756 Auto merge of #2523 - srinivasreddy:issue-2504, r=alexcrichton
3a654e4 implemented cargo package name as CARGO_PKG_NAME; And package description and home page are exposed as  CARGO_PKG_DESCRIPTION and CARGO_PKG_HOMEPAGE respectively. And add a test case - for CARGO_PKG_NAME, CARGO_PKR_DESCRIPTION, CARGO_HOMEPAGE.
54d738b Implement top-level overrides
12dbfa3 Reject manifest with duplicate dependencies in different targets

git-subtree-dir: cargo
git-subtree-split: fb9916f50201af8011180f9273c4a107952459a0

Author: apanda

Cargo.lock

@@ -1,6 +1,6 @@
 [project]
 name = "cargo"
-version = "0.10.0"
+version = "0.11.0"
 authors = ["Yehuda Katz <wycats@gmail.com>",
            "Carl Lerche <me@carllerche.com>",
            "Alex Crichton <alex@alexcrichton.com>"]
@@ -18,7 +18,7 @@ path = "src/cargo/lib.rs"
 
 [dependencies]
 advapi32-sys = "0.1"
-crates-io = { path = "src/crates-io", version = "0.1" }
+crates-io = { path = "src/crates-io", version = "0.2" }
 crossbeam = "0.2"
 curl = "0.2"
 docopt = "0.6"

Cargo.toml

@@ -1,4 +1,4 @@
-CFG_RELEASE_NUM=0.10.0
+CFG_RELEASE_NUM=0.11.0
 CFG_RELEASE_LABEL=
 
 OPENSSL_VERS=1.0.2g
@@ -172,6 +172,7 @@ OPENSSL_OS_i686-unknown-linux-gnu := linux-elf
 OPENSSL_OS_arm-unknown-linux-gnueabi := linux-armv4
 OPENSSL_OS_arm-unknown-linux-gnueabihf := linux-armv4
 OPENSSL_OS_armv7-unknown-linux-gnueabihf := linux-armv4
+OPENSSL_OS_aarch64-unknown-linux-gnu := linux-aarch64
 OPENSSL_OS_x86_64-unknown-freebsd := BSD-x86_64
 OPENSSL_OS_x86_64-unknown-netbsd := BSD-x86_64
 
@@ -181,6 +182,7 @@ OPENSSL_CC_i686-unknown-linux-gnu := gcc
 OPENSSL_CC_arm-unknown-linux-gnueabi := arm-linux-gnueabi-gcc
 OPENSSL_CC_arm-unknown-linux-gnueabihf := arm-linux-gnueabihf-gcc
 OPENSSL_CC_armv7-unknown-linux-gnueabihf := armv7-linux-gnueabihf-gcc
+OPENSSL_CC_aarch64-unknown-linux-gnu := aarch64-linux-gnu-gcc
 OPENSSL_CC_x86_64-unknown-freebsd := x86_64-unknown-freebsd10-gcc
 OPENSSL_CC_x86_64-unknown-netbsd := x86_64-unknown-netbsd-gcc
 OPENSSL_AR_x86_64-unknown-linux-gnu := ar
@@ -189,6 +191,7 @@ OPENSSL_AR_i686-unknown-linux-gnu := ar
 OPENSSL_AR_arm-unknown-linux-gnueabi := arm-linux-gnueabi-ar
 OPENSSL_AR_arm-unknown-linux-gnueabihf := arm-linux-gnueabihf-ar
 OPENSSL_AR_armv7-unknown-linux-gnueabihf := armv7-linux-gnueabihf-ar
+OPENSSL_AR_aarch64-unknown-linux-gnu := aarch64-linux-gnu-ar
 OPENSSL_AR_x86_64-unknown-freebsd := x86_64-unknown-freebsd10-ar
 OPENSSL_AR_x86_64-unknown-netbsd := x86_64-unknown-netbsd-ar
 

Makefile.in

@@ -380,6 +380,8 @@ linker = "arm-linux-gnueabi-gcc"
 linker = "arm-linux-gnueabihf-gcc"
 [target.armv7-unknown-linux-gnueabihf]
 linker = "armv7-linux-gnueabihf-gcc"
+[target.aarch64-unknown-linux-gnu]
+linker = "aarch64-linux-gnu-gcc"
 [target.x86_64-unknown-freebsd]
 linker = "x86_64-unknown-freebsd10-gcc"
 [target.x86_64-unknown-netbsd]

configure

@@ -1,11 +1,10 @@
-use std::default::Default;
 use std::fmt;
 use std::path::{PathBuf, Path};
 
 use semver::Version;
 use rustc_serialize::{Encoder, Encodable};
 
-use core::{Dependency, PackageId, Summary};
+use core::{Dependency, PackageId, PackageIdSpec, Summary};
 use core::package_id::Metadata;
 use util::{CargoResult, human};
 
@@ -20,7 +19,8 @@ pub struct Manifest {
     include: Vec<String>,
     metadata: ManifestMetadata,
     profiles: Profiles,
-    publish: bool
+    publish: bool,
+    replace: Vec<(PackageIdSpec, Dependency)>,
 }
 
 /// General metadata about a package which is just blindly uploaded to the
@@ -165,7 +165,8 @@ impl Manifest {
                links: Option<String>,
                metadata: ManifestMetadata,
                profiles: Profiles,
-               publish: bool) -> Manifest {
+               publish: bool,
+               replace: Vec<(PackageIdSpec, Dependency)>) -> Manifest {
         Manifest {
             summary: summary,
             targets: targets,
@@ -176,6 +177,7 @@ impl Manifest {
             metadata: metadata,
             profiles: profiles,
             publish: publish,
+            replace: replace,
         }
     }
 
@@ -191,6 +193,7 @@ impl Manifest {
     pub fn warnings(&self) -> &[String] { &self.warnings }
     pub fn profiles(&self) -> &Profiles { &self.profiles }
     pub fn publish(&self) -> bool { self.publish }
+    pub fn replace(&self) -> &[(PackageIdSpec, Dependency)] { &self.replace }
     pub fn links(&self) -> Option<&str> {
         self.links.as_ref().map(|s| &s[..])
     }

src/cargo/core/manifest.rs

@@ -80,6 +80,7 @@ impl Package {
     pub fn summary(&self) -> &Summary { self.manifest.summary() }
     pub fn targets(&self) -> &[Target] { self.manifest().targets() }
     pub fn version(&self) -> &Version { self.package_id().version() }
+    pub fn authors(&self) -> &Vec<String> { &self.manifest.metadata().authors }
     pub fn publish(&self) -> bool { self.manifest.publish() }
 
     pub fn has_custom_build(&self) -> bool {

src/cargo/core/package.rs

@@ -79,7 +79,7 @@ impl<'cfg> PackageRegistry<'cfg> {
         PackageRegistry {
             sources: SourceMap::new(),
             source_ids: HashMap::new(),
-            overrides: vec![],
+            overrides: Vec::new(),
             config: config,
             locked: HashMap::new(),
         }
@@ -158,21 +158,16 @@ impl<'cfg> PackageRegistry<'cfg> {
 
     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.
-            let p = profile::start(format!("updating: {}", source_id));
-            try!(source.update());
-            drop(p);
-
+            // Save off the source
+            let source = source_id.load(self.config);
             if kind == Kind::Override {
                 self.overrides.push(source_id.clone());
             }
-
-            // Save off the source
             self.add_source(source_id, source, kind);
 
-            Ok(())
+            // Ensure the source has fetched all necessary remote data.
+            let _p = profile::start(format!("updating: {}", source_id));
+            self.sources.get_mut(source_id).unwrap().update()
         }).chain_error(|| human(format!("Unable to update {}", source_id)))
     }
 
@@ -270,18 +265,16 @@ impl<'cfg> PackageRegistry<'cfg> {
 
 impl<'cfg> Registry for PackageRegistry<'cfg> {
     fn query(&mut self, dep: &Dependency) -> CargoResult<Vec<Summary>> {
-        let overrides = try!(self.query_overrides(dep));
+        let overrides = try!(self.query_overrides(&dep));
 
         let ret = if overrides.is_empty() {
             // Ensure the requested source_id is loaded
             try!(self.ensure_loaded(dep.source_id(), Kind::Normal));
-            let mut ret = Vec::new();
-            for (id, src) in self.sources.sources_mut() {
-                if id == dep.source_id() {
-                    ret.extend(try!(src.query(dep)).into_iter());
-                }
+
+            match self.sources.get_mut(dep.source_id()) {
+                Some(src) => try!(src.query(&dep)),
+                None => Vec::new(),
             }
-            ret
         } else {
             overrides
         };

src/cargo/core/registry.rs

@@ -26,18 +26,23 @@ impl EncodableResolve {
 
         let mut g = Graph::new();
         let mut tmp = HashMap::new();
+        let mut replacements = HashMap::new();
 
         let packages = Vec::new();
         let packages = self.package.as_ref().unwrap_or(&packages);
 
-        let root = try!(to_package_id(&self.root.name,
-                                      &self.root.version,
-                                      self.root.source.as_ref(),
-                                      default, &path_deps));
-        let ids = try!(packages.iter().map(|p| {
-            to_package_id(&p.name, &p.version, p.source.as_ref(),
+        let id2pkgid = |id: &EncodablePackageId| {
+            to_package_id(&id.name, &id.version, id.source.as_ref(),
                           default, &path_deps)
-        }).collect::<CargoResult<Vec<_>>>());
+        };
+        let dep2pkgid = |dep: &EncodableDependency| {
+            to_package_id(&dep.name, &dep.version, dep.source.as_ref(),
+                          default, &path_deps)
+        };
+
+        let root = try!(dep2pkgid(&self.root));
+        let ids = try!(packages.iter().map(&dep2pkgid)
+                               .collect::<CargoResult<Vec<_>>>());
 
         {
             let mut register_pkg = |pkgid: &PackageId| {
@@ -57,16 +62,22 @@ impl EncodableResolve {
         {
             let mut add_dependencies = |id: &PackageId, pkg: &EncodableDependency|
                                         -> CargoResult<()> {
+                if let Some(ref replace) = pkg.replace {
+                    let replace = try!(id2pkgid(replace));
+                    let replace_precise = tmp.get(&replace).map(|p| {
+                        replace.with_precise(p.clone())
+                    }).unwrap_or(replace);
+                    replacements.insert(id.clone(), replace_precise);
+                    assert!(pkg.dependencies.is_none());
+                    return Ok(())
+                }
+
                 let deps = match pkg.dependencies {
                     Some(ref deps) => deps,
                     None => return Ok(()),
                 };
                 for edge in deps.iter() {
-                    let to_depend_on = try!(to_package_id(&edge.name,
-                                                          &edge.version,
-                                                          edge.source.as_ref(),
-                                                          default,
-                                                          &path_deps));
+                    let to_depend_on = try!(id2pkgid(edge));
                     let precise_pkgid =
                         tmp.get(&to_depend_on)
                            .map(|p| to_depend_on.with_precise(p.clone()))
@@ -87,6 +98,7 @@ impl EncodableResolve {
             root: root,
             features: HashMap::new(),
             metadata: self.metadata.clone(),
+            replacements: replacements,
         })
     }
 }
@@ -136,7 +148,8 @@ pub struct EncodableDependency {
     name: String,
     version: String,
     source: Option<SourceId>,
-    dependencies: Option<Vec<EncodablePackageId>>
+    dependencies: Option<Vec<EncodablePackageId>>,
+    replace: Option<EncodablePackageId>,
 }
 
 #[derive(Debug, PartialOrd, Ord, PartialEq, Eq)]
@@ -186,24 +199,32 @@ impl Encodable for Resolve {
         let encodable = ids.iter().filter_map(|&id| {
             if self.root == *id { return None; }
 
-            Some(encodable_resolve_node(id, &self.graph))
+            Some(encodable_resolve_node(id, self))
         }).collect::<Vec<EncodableDependency>>();
 
         EncodableResolve {
             package: Some(encodable),
-            root: encodable_resolve_node(&self.root, &self.graph),
+            root: encodable_resolve_node(&self.root, self),
             metadata: self.metadata.clone(),
         }.encode(s)
     }
 }
 
-fn encodable_resolve_node(id: &PackageId, graph: &Graph<PackageId>)
+fn encodable_resolve_node(id: &PackageId, resolve: &Resolve)
                           -> EncodableDependency {
-    let deps = graph.edges(id).map(|edge| {
-        let mut deps = edge.map(encodable_package_id).collect::<Vec<_>>();
-        deps.sort();
-        deps
-    });
+    let (replace, deps) = match resolve.replacement(id) {
+        Some(id) => {
+            (Some(encodable_package_id(id)), None)
+        }
+        None => {
+            let mut deps = resolve.graph.edges(id)
+                                  .into_iter().flat_map(|a| a)
+                                  .map(encodable_package_id)
+                                  .collect::<Vec<_>>();
+            deps.sort();
+            (None, Some(deps))
+        }
+    };
 
     let source = if id.source_id().is_path() {
         None
@@ -216,6 +237,7 @@ fn encodable_resolve_node(id: &PackageId, graph: &Graph<PackageId>)
         version: id.version().to_string(),
         source: source,
         dependencies: deps,
+        replace: replace,
     }
 }