itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(resolver): Suggest similar looking features

Browse Source
This commit is contained in:
Ed Page 2025-04-25 09:21:09 -05:00
parent f616aaf21a
commit 08ed8de4d1
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cargo/core/resolver/errors.rs
View File

@ -5,7 +5,7 @@ use std::task::Poll;
use crate::core::{Dependency, PackageId, Registry, Summary};
use crate::sources::source::QueryKind;
use crate::sources::IndexSummary;
use crate::util::edit_distance::edit_distance;
use crate::util::edit_distance::{closest, edit_distance};
use crate::util::errors::CargoResult;
use crate::util::{GlobalContext, OptVersionReq, VersionExt};
use anyhow::Error;
@ -160,6 +160,14 @@ pub(super) fn activation_error(
msg.push_str("` but `");
msg.push_str(&*dep.package_name());
msg.push_str("` does not have that feature.\n");
let latest = candidates.last().expect("in the non-empty branch");
if let Some(closest) = closest(feature, latest.features().keys(), |k| k) {
msg.push_str(" package `");
msg.push_str(&*dep.package_name());
msg.push_str("` does have feature `");
msg.push_str(closest);
msg.push_str("`\n");
}
// p == parent so the full path is redundant.
}
ConflictReason::RequiredDependencyAsFeature(feature) => {

1
tests/testsuite/features.rs
View File

@ -280,6 +280,7 @@ fn dependency_activates_typoed_feature() {
versions that meet the requirements `*` are: 0.0.1
package `foo` depends on `bar` with feature `bar` but `bar` does not have that feature.
package `bar` does have feature `baz`
failed to select a version for `bar` which could resolve this conflict