Merge remote-tracking branch 'upstream/master' into alt-registry-publish

Conflicts:
	src/cargo/util/toml/mod.rs

diff --cc src/cargo/ops/registry.rs
Simple merge

diff --cc src/cargo/util/toml/mod.rs
index d8aaada23bab55e1ccae088ea17e59f3c6ecc413,bf130b0ea878bddd7492fa5f13fa1e07888e9a7c..622c2674c0ec81a6ae0851ff8fe5643447f6085a
--- 1/src/cargo/util/toml/mod.rs
--- 2/src/cargo/util/toml/mod.rs
+++ b/src/cargo/util/toml/mod.rs
@@@ -686,14 -655,7 +693,11 @@@ impl TomlManifest 
              }
          };
          let profiles = build_profiles(&me.profile);
 -        let publish = project.publish.unwrap_or(true);
 +        let publish = match project.publish {
 +            Some(VecStringOrBool::VecString(ref vecstring)) => Some(vecstring.clone()),
 +            Some(VecStringOrBool::Bool(false)) => Some(vec![]),
 +            _ => None,
 +        };
-         let empty = Vec::new();
-         let cargo_features = me.cargo_features.as_ref().unwrap_or(&empty);
-         let features = Features::new(cargo_features, &mut warnings)?;
          let mut manifest = Manifest::new(summary,
                                           targets,
                                           exclude,

diff --cc tests/publish.rs
Simple merge