diff --git a/src/cargo/util/toml/mod.rs b/src/cargo/util/toml/mod.rs index e29a7ea6651..2fa704a8b87 100644 --- a/src/cargo/util/toml/mod.rs +++ b/src/cargo/util/toml/mod.rs @@ -324,7 +324,7 @@ fn resolve_toml( }); resolved_toml.package = Some(resolved_package); - resolved_toml.features = resolve_features(original_toml.features.as_ref(), edition)?; + resolved_toml.features = resolve_features(original_toml.features.as_ref())?; resolved_toml.lib = targets::resolve_lib( original_toml.lib.as_ref(), @@ -693,34 +693,11 @@ fn default_readme_from_package_root(package_root: &Path) -> Option { #[tracing::instrument(skip_all)] fn resolve_features( original_features: Option<&BTreeMap>>, - edition: Edition, ) -> CargoResult>>> { - let Some(mut resolved_features) = original_features.cloned() else { + let Some(resolved_features) = original_features.cloned() else { return Ok(None); }; - if Edition::Edition2024 <= edition { - for activations in resolved_features.values_mut() { - let mut deps = Vec::new(); - for feature_value in activations.iter() { - let feature_value = FeatureValue::new(InternedString::new(feature_value)); - let FeatureValue::DepFeature { - dep_name, - dep_feature: _, - weak: false, - } = feature_value - else { - continue; - }; - let dep = FeatureValue::Dep { dep_name }.to_string(); - if !activations.contains(&dep) { - deps.push(dep); - } - } - activations.extend(deps); - } - } - Ok(Some(resolved_features)) } diff --git a/tests/testsuite/features.rs b/tests/testsuite/features.rs index f821395e34a..7962f18f1a8 100644 --- a/tests/testsuite/features.rs +++ b/tests/testsuite/features.rs @@ -1889,27 +1889,17 @@ fn strong_dep_feature_edition2024() { p.cargo("metadata") .masquerade_as_nightly_cargo(&["edition2024"]) - .with_stdout_data( - str![[r#" -{ - "metadata": null, - "packages": [ - { - "features": { - "optional_dep": [ - "optional_dep/foo", - "dep:optional_dep" - ] - }, - "name": "foo", - "...": "{...}" - } - ], - "...": "{...}" -} -"#]] - .json(), - ) + .with_status(101) + .with_stderr_data(str![[r#" +[ERROR] feature `optional_dep` includes `optional_dep/foo`, but `optional_dep` is not a dependency + --> Cargo.toml:9:32 + | +9 | optional_dep = ["optional_dep/foo"] + | ^^^^^^^^^^^^^^^^^^^^ + | +[ERROR] failed to parse manifest at `[ROOT]/foo/Cargo.toml` + +"#]]) .run(); }