about summary refs log tree commit diff
path: root/src/librustc_resolve
diff options
context:
space:
mode:
authorEsteban Küber <esteban@kuber.com.ar>2020-04-07 18:07:26 -0700
committerEsteban Küber <esteban@kuber.com.ar>2020-04-07 18:07:26 -0700
commita3e54b59f9779b800d067645d59e92bdc3ce53c1 (patch)
tree68545d0c6854228724b54d04e0df59b97e27c0fb /src/librustc_resolve
parentb543afca9b90ad6e4689b6d613ab51f9d3ba15e7 (diff)
downloadrust-a3e54b59f9779b800d067645d59e92bdc3ce53c1.tar.gz
rust-a3e54b59f9779b800d067645d59e92bdc3ce53c1.zip
Do not suggest adding type param when `use` is already suggested
Fix #70365, cc #70572.
Diffstat (limited to 'src/librustc_resolve')
-rw-r--r--src/librustc_resolve/lib.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/librustc_resolve/lib.rs b/src/librustc_resolve/lib.rs
index 21f43b6fd4f..525a0955c0a 100644
--- a/src/librustc_resolve/lib.rs
+++ b/src/librustc_resolve/lib.rs
@@ -2480,8 +2480,7 @@ impl<'a> Resolver<'a> {
             let (span, found_use) = UsePlacementFinder::check(krate, node_id);
             if !candidates.is_empty() {
                 diagnostics::show_candidates(&mut err, span, &candidates, better, found_use);
-            }
-            if let Some((span, msg, sugg, appl)) = suggestion {
+            } else if let Some((span, msg, sugg, appl)) = suggestion {
                 err.span_suggestion(span, msg, sugg, appl);
             }
             err.emit();