Get features in virtual manifest.
authorboats <boats@mozilla.com>
Thu, 5 Oct 2017 23:13:53 +0000 (23:13 +0000)
committerGitHub <noreply@github.com>
Thu, 5 Oct 2017 23:13:53 +0000 (23:13 +0000)
src/cargo/util/toml/mod.rs

index 487d46f93c974e50a6dda4956dc8b031d32a9f34..c5566b9cb2d1a8cafd0efde2a7fc5dc23d88eeae 100644 (file)
@@ -717,6 +717,10 @@ impl TomlManifest {
         let mut nested_paths = Vec::new();
         let mut warnings = Vec::new();
         let mut deps = Vec::new();
+        let empty = Vec::new();
+        let cargo_features = me.cargo_features.as_ref().unwrap_or(&empty);
+        let features = Features::new(&cargo_features, &mut warnings)?;
+
         let (replace, patch) = {
             let mut cx = Context {
                 pkgid: None,
@@ -726,7 +730,7 @@ impl TomlManifest {
                 config: config,
                 warnings: &mut warnings,
                 platform: None,
-                features: &Features::default(), // @alex: is this right?
+                features: &features,
                 root: root
             };
             (me.replace(&mut cx)?, me.patch(&mut cx)?)