From: Chris Swindle <christopher.swindle@metaswitch.com>
Date: Wed, 25 Oct 2017 20:21:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master' into alt-registry-publish
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~5^2~1^2~9
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=77ca3777b4b64d99b46b77e9124194bd83ac000e;p=cargo.git

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

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

77ca3777b4b64d99b46b77e9124194bd83ac000e
diff --cc src/cargo/util/toml/mod.rs
index d8aaada23,bf130b0ea..622c2674c
--- a/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,