Propagate cargo features from source manifest

dtolnay · Dec 20, 2023 · d3cd15b · d3cd15b
1 parent c28428d
commit d3cd15b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/dependencies.rs b/src/dependencies.rs
@@ -96,6 +96,8 @@ pub struct WorkspacePackage {
 
 #[derive(Deserialize, Default, Debug)]
 pub struct Manifest {
+    #[serde(rename = "cargo-features", default)]
+    pub cargo_features: Vec<String>,
     #[serde(default)]
     pub package: Package,
     #[serde(default)]

diff --git a/src/run.rs b/src/run.rs
@@ -5,7 +5,7 @@ use crate::env::Update;
 use crate::error::{Error, Result};
 use crate::expand::{expand_globs, ExpandedTest};
 use crate::flock::Lock;
-use crate::manifest::{Bin, Build, Config, Edition, Manifest, Name, Package, Workspace};
+use crate::manifest::{Bin, Build, Config, Manifest, Name, Package, Workspace};
 use crate::message::{self, Fail, Warn};
 use crate::normalize::{self, Context, Variations};
 use crate::{features, rustflags, Expected, Runner, Test};
@@ -222,12 +222,6 @@ impl Runner {
                 .ok_or(Error::NoWorkspaceManifest)?,
         };
 
-        let cargo_features = if let Edition::E2024 = edition {
-            vec!["edition2024".to_owned()]
-        } else {
-            vec![]
-        };
-
         let mut dependencies = Map::new();
         dependencies.extend(source_manifest.dependencies);
         dependencies.extend(source_manifest.dev_dependencies);
@@ -292,7 +286,7 @@ impl Runner {
         }
 
         let mut manifest = Manifest {
-            cargo_features,
+            cargo_features: source_manifest.cargo_features,
             package: Package {
                 name: project_name.to_owned(),
                 version: "0.0.0".to_owned(),