From f3021b3561dd89c248bb7238c286f1cd77c2c951 Mon Sep 17 00:00:00 2001
From: Esteban Kuber <esteban@kuber.com.ar>
Date: Mon, 9 Aug 2021 16:47:09 +0000
Subject: [PATCH] Use smaller spans when suggesting method call disambiguation
---
compiler/rustc_typeck/src/check/method/suggest.rs | 12 ++++++------
.../associated-const-ambiguity-report.stderr | 4 ++--
src/test/ui/error-codes/E0034.stderr | 4 ++--
src/test/ui/issues/issue-18446.stderr | 9 +++++----
.../method-ambig-two-traits-from-impls2.stderr | 4 ++--
src/test/ui/span/issue-7575.stderr | 9 +++++----
6 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/compiler/rustc_typeck/src/check/method/suggest.rs b/compiler/rustc_typeck/src/check/method/suggest.rs
index 77586ce48529c..c7a7462668aa5 100644
--- a/compiler/rustc_typeck/src/check/method/suggest.rs
+++ b/compiler/rustc_typeck/src/check/method/suggest.rs
@@ -1695,8 +1695,8 @@ fn print_disambiguation_help(
source_map: &source_map::SourceMap,
) {
let mut applicability = Applicability::MachineApplicable;
- let sugg_args = if let (ty::AssocKind::Fn, Some(args)) = (kind, args) {
- format!(
+ let (span, sugg) = if let (ty::AssocKind::Fn, Some(args)) = (kind, args) {
+ let args = format!(
"({}{})",
if rcvr_ty.is_region_ptr() {
if rcvr_ty.is_mutable_ptr() { "&mut " } else { "&" }
@@ -1710,12 +1710,12 @@ fn print_disambiguation_help(
}))
.collect::<Vec<_>>()
.join(", "),
- )
+ );
+ (span, format!("{}::{}{}", trait_name, item_name, args))
} else {
- String::new()
+ (span.with_hi(item_name.span.lo()), format!("{}::", trait_name))
};
- let sugg = format!("{}::{}{}", trait_name, item_name, sugg_args);
- err.span_suggestion(
+ err.span_suggestion_verbose(
span,
&format!(
"disambiguate the {} for {}",
diff --git a/src/test/ui/associated-consts/associated-const-ambiguity-report.stderr b/src/test/ui/associated-consts/associated-const-ambiguity-report.stderr
index c5e32afbbce40..fc94ef2ff8872 100644
--- a/src/test/ui/associated-consts/associated-const-ambiguity-report.stderr
+++ b/src/test/ui/associated-consts/associated-const-ambiguity-report.stderr
@@ -17,11 +17,11 @@ LL | const ID: i32 = 3;
help: disambiguate the associated constant for candidate #1
|
LL | const X: i32 = Foo::ID;
- | ^^^^^^^
+ | ^^^^^
help: disambiguate the associated constant for candidate #2
|
LL | const X: i32 = Bar::ID;
- | ^^^^^^^
+ | ^^^^^
error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0034.stderr b/src/test/ui/error-codes/E0034.stderr
index 471512ca8f72c..55119857d8f83 100644
--- a/src/test/ui/error-codes/E0034.stderr
+++ b/src/test/ui/error-codes/E0034.stderr
@@ -17,11 +17,11 @@ LL | fn foo() {}
help: disambiguate the associated function for candidate #1
|
LL | Trait1::foo()
- | ^^^^^^^^^^^
+ | ^^^^^^^^
help: disambiguate the associated function for candidate #2
|
LL | Trait2::foo()
- | ^^^^^^^^^^^
+ | ^^^^^^^^
error: aborting due to previous error
diff --git a/src/test/ui/issues/issue-18446.stderr b/src/test/ui/issues/issue-18446.stderr
index 11c8cfdcf66a5..33cf76d777bb6 100644
--- a/src/test/ui/issues/issue-18446.stderr
+++ b/src/test/ui/issues/issue-18446.stderr
@@ -2,10 +2,7 @@ error[E0034]: multiple applicable items in scope
--> $DIR/issue-18446.rs:18:7
|
LL | x.foo();
- | --^^^--
- | | |
- | | multiple `foo` found
- | help: disambiguate the associated function for candidate #2: `T::foo(&x)`
+ | ^^^ multiple `foo` found
|
note: candidate #1 is defined in an impl for the type `(dyn T + 'a)`
--> $DIR/issue-18446.rs:9:5
@@ -17,6 +14,10 @@ note: candidate #2 is defined in the trait `T`
|
LL | fn foo(&self);
| ^^^^^^^^^^^^^^
+help: disambiguate the associated function for candidate #2
+ |
+LL | T::foo(&x);
+ | ^^^^^^^^^^
error: aborting due to previous error
diff --git a/src/test/ui/methods/method-ambig-two-traits-from-impls2.stderr b/src/test/ui/methods/method-ambig-two-traits-from-impls2.stderr
index 85b3964788590..7bfb8baa0c643 100644
--- a/src/test/ui/methods/method-ambig-two-traits-from-impls2.stderr
+++ b/src/test/ui/methods/method-ambig-two-traits-from-impls2.stderr
@@ -17,11 +17,11 @@ LL | fn foo() {}
help: disambiguate the associated function for candidate #1
|
LL | A::foo();
- | ^^^^^^
+ | ^^^
help: disambiguate the associated function for candidate #2
|
LL | B::foo();
- | ^^^^^^
+ | ^^^
error: aborting due to previous error
diff --git a/src/test/ui/span/issue-7575.stderr b/src/test/ui/span/issue-7575.stderr
index 16a1ac6d71814..f789441378fe4 100644
--- a/src/test/ui/span/issue-7575.stderr
+++ b/src/test/ui/span/issue-7575.stderr
@@ -61,10 +61,7 @@ error[E0599]: no method named `is_str` found for type parameter `T` in the curre
--> $DIR/issue-7575.rs:70:7
|
LL | t.is_str()
- | --^^^^^^--
- | | |
- | | this is an associated function, not a method
- | help: disambiguate the associated function for the candidate: `ManyImplTrait::is_str(t)`
+ | ^^^^^^ this is an associated function, not a method
|
= note: found the following associated functions; to be used as methods, functions must have a `self` parameter
note: the candidate is defined in the trait `ManyImplTrait`
@@ -73,6 +70,10 @@ note: the candidate is defined in the trait `ManyImplTrait`
LL | fn is_str() -> bool {
| ^^^^^^^^^^^^^^^^^^^
= help: items from traits can only be used if the type parameter is bounded by the trait
+help: disambiguate the associated function for the candidate
+ |
+LL | ManyImplTrait::is_str(t)
+ |
error: aborting due to 3 previous errors