Skip to content

Commit fd5f1a0

Browse files
borsbors
committed
Auto merge of #14630 - epage:implicit-removal, r=weihanglo
fix: Remove implicit feature removal ### What does this PR try to resolve? Due to problems we ran into with #14016, we're removing implicit features from the 2024 edition to give ourselves more time to design it as we should. ### How should we test and review this PR? ### Additional information I could have added a new flag for this or made an EditionNext but I decided to remove it in the hopes to avoid any path dependency in solving this the next time.
2 parents 8fdd7f4 + 7be5a21 commit fd5f1a0

File tree

11 files changed

+13
-1286
lines changed

11 files changed

+13
-1286
lines changed

‎src/cargo/core/workspace.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ use crate::sources::{PathSource, SourceConfigMap, CRATES_IO_INDEX, CRATES_IO_REG
2424
use crate::util::edit_distance;
2525
use crate::util::errors::{CargoResult, ManifestError};
2626
use crate::util::interning::InternedString;
27-
use crate::util::lints::{
28-
analyze_cargo_lints_table, check_im_a_teapot, check_implicit_features, unused_dependencies,
29-
};
27+
use crate::util::lints::{analyze_cargo_lints_table, check_im_a_teapot};
3028
use crate::util::toml::{read_manifest, InheritableFields};
3129
use crate::util::{
3230
context::CargoResolverConfig, context::ConfigRelativePath, context::IncompatibleRustVersions,
@@ -1240,8 +1238,6 @@ impl<'gctx> Workspace<'gctx> {
12401238
self.gctx,
12411239
)?;
12421240
check_im_a_teapot(pkg, &path, &cargo_lints, &mut error_count, self.gctx)?;
1243-
check_implicit_features(pkg, &path, &cargo_lints, &mut error_count, self.gctx)?;
1244-
unused_dependencies(pkg, &path, &cargo_lints, &mut error_count, self.gctx)?;
12451241
if error_count > 0 {
12461242
Err(crate::util::errors::AlreadyPrintedError::new(anyhow!(
12471243
"encountered {error_count} errors(s) while running lints"

‎src/cargo/ops/fix.rs

+1-76
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,12 @@ use crate::core::compiler::CompileKind;
5555
use crate::core::compiler::RustcTargetData;
5656
use crate::core::resolver::features::{DiffMap, FeatureOpts, FeatureResolver, FeaturesFor};
5757
use crate::core::resolver::{HasDevUnits, Resolve, ResolveBehavior};
58+
use crate::core::PackageIdSpecQuery as _;
5859
use crate::core::{Edition, MaybePackage, Package, PackageId, Workspace};
59-
use crate::core::{FeatureValue, PackageIdSpecQuery as _};
6060
use crate::ops::resolve::WorkspaceResolve;
6161
use crate::ops::{self, CompileOptions};
6262
use crate::util::diagnostic_server::{Message, RustfixDiagnosticServer};
6363
use crate::util::errors::CargoResult;
64-
use crate::util::interning::InternedString;
6564
use crate::util::GlobalContext;
6665
use crate::util::{existing_vcs_repo, LockServer, LockServerClient};
6766
use crate::{drop_eprint, drop_eprintln};
@@ -287,7 +286,6 @@ fn migrate_manifests(ws: &Workspace<'_>, pkgs: &[&Package]) -> CargoResult<()> {
287286
fixes += rename_dep_fields_2024(workspace, "dependencies");
288287
}
289288

290-
fixes += add_feature_for_unused_deps(pkg, root, ws.gctx());
291289
fixes += rename_table(root, "project", "package");
292290
if let Some(target) = root.get_mut("lib").and_then(|t| t.as_table_like_mut()) {
293291
fixes += rename_target_fields_2024(target);
@@ -437,79 +435,6 @@ fn rename_table(parent: &mut dyn toml_edit::TableLike, old: &str, new: &str) ->
437435
1
438436
}
439437

440-
fn add_feature_for_unused_deps(
441-
pkg: &Package,
442-
parent: &mut dyn toml_edit::TableLike,
443-
gctx: &GlobalContext,
444-
) -> usize {
445-
let manifest = pkg.manifest();
446-
447-
let activated_opt_deps = manifest
448-
.normalized_toml()
449-
.features()
450-
.map(|map| {
451-
map.values()
452-
.flatten()
453-
.filter_map(|f| match FeatureValue::new(InternedString::new(f)) {
454-
FeatureValue::Dep { dep_name } => Some(dep_name.as_str()),
455-
_ => None,
456-
})
457-
.collect::<HashSet<_>>()
458-
})
459-
.unwrap_or_default();
460-
461-
let mut fixes = 0;
462-
for dep in manifest.dependencies() {
463-
let dep_name_in_toml = dep.name_in_toml();
464-
if dep.is_optional() && !activated_opt_deps.contains(dep_name_in_toml.as_str()) {
465-
if let Some(features) = parent
466-
.entry("features")
467-
.or_insert(toml_edit::table())
468-
.as_table_like_mut()
469-
{
470-
let activate_dep = format!("dep:{dep_name_in_toml}");
471-
let strong_dep_feature_prefix = format!("{dep_name_in_toml}/");
472-
features
473-
.entry(dep_name_in_toml.as_str())
474-
.or_insert_with(|| {
475-
fixes += 1;
476-
toml_edit::Item::Value(toml_edit::Value::Array(
477-
toml_edit::Array::from_iter([&activate_dep]),
478-
))
479-
});
480-
// Ensure `dep:dep_name` is present for `dep_name/feature_name` since `dep:` is the
481-
// only way to guarantee an optional dependency is available for use.
482-
//
483-
// The way we avoid implicitly creating features in Edition2024 is we remove the
484-
// dependency from `normalized_toml` if there is no `dep:` syntax as that is the only
485-
// syntax that suppresses the creation of the implicit feature.
486-
for (feature_name, activations) in features.iter_mut() {
487-
let Some(activations) = activations.as_array_mut() else {
488-
let _ = gctx.shell().warn(format_args!("skipping fix of feature `{feature_name}` in package `{}`: unsupported feature schema", pkg.name()));
489-
continue;
490-
};
491-
if activations
492-
.iter()
493-
.any(|a| a.as_str().map(|a| a == activate_dep).unwrap_or(false))
494-
{
495-
continue;
496-
}
497-
let Some(activate_dep_pos) = activations.iter().position(|a| {
498-
a.as_str()
499-
.map(|a| a.starts_with(&strong_dep_feature_prefix))
500-
.unwrap_or(false)
501-
}) else {
502-
continue;
503-
};
504-
fixes += 1;
505-
activations.insert(activate_dep_pos, &activate_dep);
506-
}
507-
}
508-
}
509-
}
510-
fixes
511-
}
512-
513438
fn check_resolver_change<'gctx>(
514439
ws: &Workspace<'gctx>,
515440
target_data: &mut RustcTargetData<'gctx>,

0 commit comments

Comments
 (0)