Fixup rebase artifacts

rust-lang · Feb 4, 2025 · 32ea0cd · 32ea0cd
1 parent c5444d0
commit 32ea0cd
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/cargo/core/resolver/dep_cache.rs b/src/cargo/core/resolver/dep_cache.rs
@@ -517,8 +517,12 @@ impl RequirementError {
                 if deps.is_empty() {
                     return match parent {
                         None => {
-                            let closest =
-                                closest_msg(&feat.as_str(), summary.features().keys(), |key| &key);
+                            let closest = closest_msg(
+                                &feat.as_str(),
+                                summary.features().keys(),
+                                |key| &key,
+                                "feature",
+                            );
                             ActivateError::Fatal(anyhow::format_err!(
                                 "Package `{}` does not have the feature `{}`{}",
                                 summary.package_id(),

diff --git a/tests/testsuite/package_features.rs b/tests/testsuite/package_features.rs
@@ -340,7 +340,7 @@ f3f4
         .with_stderr_data(str![[r#"
 [ERROR] Package `foo v0.1.0 ([ROOT]/foo)` does not have the feature `f2`
 
-	Did you mean `f1`?
+[HELP] a feature with a similar name exists: `f1`
 
 "#]])
         .run();
@@ -408,7 +408,7 @@ fn feature_default_resolver() {
         .with_stderr_data(str![[r#"
 [ERROR] Package `a v0.1.0 ([ROOT]/foo)` does not have the feature `testt`
 
-	Did you mean `test`?
+[HELP] a feature with a similar name exists: `test`
 
 "#]])
         .run();
@@ -822,7 +822,7 @@ m1-feature set
         .with_stderr_data(str![[r#"
 [ERROR] Package `member1 v0.1.0 ([ROOT]/foo/member1)` does not have the feature `m2-feature`
 
-	Did you mean `m1-feature`?
+[HELP] a feature with a similar name exists: `m1-feature`
 
 "#]])
         .run();