Added QueryKind::Normalized, and used it in cargo-add

Author: LuuuXXX

crates/resolver-tests/src/lib.rs

@@ -113,6 +113,7 @@ pub fn resolve_with_config_raw(
                 let matched = match kind {
                     QueryKind::Exact => dep.matches(summary),
                     QueryKind::Fuzzy => true,
+                    QueryKind::Normalized => true,
                 };
                 if matched {
                     self.used.insert(summary.package_id());

src/cargo/ops/cargo_add/mod.rs

@@ -588,7 +588,7 @@ fn get_latest_dependency(
         }
         MaybeWorkspace::Other(query) => {
             let possibilities = loop {
-                match registry.query_vec(&query, QueryKind::Fuzzy) {
+                match registry.query_vec(&query, QueryKind::Normalized) {
                     std::task::Poll::Ready(res) => {
                         break res?;
                     }
@@ -711,7 +711,7 @@ fn select_package(
         MaybeWorkspace::Other(query) => {
             let possibilities = loop {
                 // Exact to avoid returning all for path/git
-                match registry.query_vec(&query, QueryKind::Exact) {
+                match registry.query_vec(&query, QueryKind::Normalized) {
                     std::task::Poll::Ready(res) => {
                         break res?;
                     }
@@ -938,7 +938,7 @@ fn populate_available_features(
     }
 
     let possibilities = loop {
-        match registry.query_vec(&query, QueryKind::Exact) {
+        match registry.query_vec(&query, QueryKind::Normalized) {
             std::task::Poll::Ready(res) => {
                 break res?;
             }

src/cargo/sources/directory.rs

@@ -109,6 +109,7 @@ impl<'cfg> Source for DirectorySource<'cfg> {
         let matches = packages.filter(|pkg| match kind {
             QueryKind::Exact => dep.matches(pkg.summary()),
             QueryKind::Fuzzy => true,
+            QueryKind::Normalized => dep.matches(pkg.summary()),
         });
         for summary in matches.map(|pkg| pkg.summary().clone()) {
             f(IndexSummary::Candidate(summary));

src/cargo/sources/path.rs

@@ -555,6 +555,7 @@ impl<'cfg> Source for PathSource<'cfg> {
             let matched = match kind {
                 QueryKind::Exact => dep.matches(s),
                 QueryKind::Fuzzy => true,
+                QueryKind::Normalized => dep.matches(s),
             };
             if matched {
                 f(IndexSummary::Candidate(s.clone()))

src/cargo/sources/registry/mod.rs

@@ -793,6 +793,7 @@ impl<'cfg> Source for RegistrySource<'cfg> {
                     let matched = match kind {
                         QueryKind::Exact => dep.matches(s.as_summary()),
                         QueryKind::Fuzzy => true,
+                        QueryKind::Normalized => true,
                     };
                     if !matched {
                         return;
@@ -831,7 +832,7 @@ impl<'cfg> Source for RegistrySource<'cfg> {
                 return Poll::Ready(Ok(()));
             }
             let mut any_pending = false;
-            if kind == QueryKind::Fuzzy {
+            if kind == QueryKind::Fuzzy || kind == QueryKind::Normalized {
                 // Attempt to handle misspellings by searching for a chain of related
                 // names to the original name. The resolver will later
                 // reject any candidates that have the wrong name, and with this it'll

src/cargo/sources/source.rs

@@ -180,6 +180,9 @@ pub enum QueryKind {
     /// whereas an `Registry` source may return dependencies that have the same
     /// canonicalization.
     Fuzzy,
+    /// Match a denpendency in all ways and will normalize the package name.
+    /// Each source defines what normalizing means.
+    Normalized,
 }
 
 /// A download status that represents if a [`Package`] has already been

tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/mod.rs

@@ -15,7 +15,7 @@ fn case() {
         .arg_line("cbindgen")
         .current_dir(cwd)
         .assert()
-        .success()
+        .failure()
         .stdout_matches(file!["stdout.log"])
         .stderr_matches(file!["stderr.log"]);
 

tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/out/Cargo.toml

@@ -2,7 +2,4 @@
 
 [package]
 name = "cargo-list-test-fixture"
-version = "0.0.0"
-
-[dependencies]
-aa = "0.0.0"
+version = "0.0.0"

tests/testsuite/cargo_add/add_no_vendored_package_with_vendor/stderr.log

@@ -1,2 +1 @@
-warning: translating `cbindgen` to `aa`
-      Adding aa v0.0.0 to dependencies
+error: the crate `cbindgen` could not be found in registry index.