about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/ui/error-codes/E0283.stderr5
-rw-r--r--src/test/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.rs8
-rw-r--r--src/test/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.stderr16
-rw-r--r--src/test/ui/traits/issue-77982.stderr16
4 files changed, 24 insertions, 21 deletions
diff --git a/src/test/ui/error-codes/E0283.stderr b/src/test/ui/error-codes/E0283.stderr
index 7dcfe96b35c..e2bab486064 100644
--- a/src/test/ui/error-codes/E0283.stderr
+++ b/src/test/ui/error-codes/E0283.stderr
@@ -14,7 +14,6 @@ LL |     let bar = foo_impl.into() * 1u32;
    |               |        |
    |               |        cannot infer type for type parameter `T` declared on the trait `Into`
    |               this method call resolves to `T`
-   |               help: use the fully qualified path for the potential candidate: `<Impl as Into<u32>>::into(foo_impl)`
    |
 note: multiple `impl`s satisfying `Impl: Into<_>` found
   --> $DIR/E0283.rs:17:1
@@ -24,6 +23,10 @@ LL | impl Into<u32> for Impl {
    = note: and another `impl` found in the `core` crate:
            - impl<T, U> Into<U> for T
              where U: From<T>;
+help: use the fully qualified path for the potential candidate
+   |
+LL |     let bar = <Impl as Into<u32>>::into(foo_impl) * 1u32;
+   |               ++++++++++++++++++++++++++        ~
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.rs b/src/test/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.rs
index f08025d99b5..9a444be500c 100644
--- a/src/test/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.rs
+++ b/src/test/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.rs
@@ -1,20 +1,20 @@
 struct Thing<X>(X);
 
 trait Method<T> {
-    fn method(self) -> T;
+    fn method(self, _: i32) -> T;
 }
 
 impl<X> Method<i32> for Thing<X> {
-    fn method(self) -> i32 { 0 }
+    fn method(self, _: i32) -> i32 { 0 }
 }
 
 impl<X> Method<u32> for Thing<X> {
-    fn method(self) -> u32 { 0 }
+    fn method(self, _: i32) -> u32 { 0 }
 }
 
 fn main() {
     let thing = Thing(true);
-    thing.method();
+    thing.method(42);
     //~^ ERROR type annotations needed
     //~| ERROR type annotations needed
 }
diff --git a/src/test/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.stderr b/src/test/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.stderr
index 2e80fa89f63..0e52420ec43 100644
--- a/src/test/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.stderr
+++ b/src/test/ui/traits/do-not-mention-type-params-by-name-in-suggestion-issue-96292.stderr
@@ -1,8 +1,8 @@
 error[E0282]: type annotations needed
   --> $DIR/do-not-mention-type-params-by-name-in-suggestion-issue-96292.rs:17:11
    |
-LL |     thing.method();
-   |     ------^^^^^^--
+LL |     thing.method(42);
+   |     ------^^^^^^----
    |     |     |
    |     |     cannot infer type for type parameter `T` declared on the trait `Method`
    |     this method call resolves to `T`
@@ -10,8 +10,8 @@ LL |     thing.method();
 error[E0283]: type annotations needed
   --> $DIR/do-not-mention-type-params-by-name-in-suggestion-issue-96292.rs:17:11
    |
-LL |     thing.method();
-   |     ------^^^^^^--
+LL |     thing.method(42);
+   |     ------^^^^^^----
    |     |     |
    |     |     cannot infer type for type parameter `T` declared on the trait `Method`
    |     this method call resolves to `T`
@@ -26,10 +26,10 @@ LL | impl<X> Method<u32> for Thing<X> {
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 help: use the fully qualified path for the potential candidates
    |
-LL |     <Thing<_> as Method<i32>>::method(thing);
-   |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-LL |     <Thing<_> as Method<u32>>::method(thing);
-   |     ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+LL |     <Thing<_> as Method<i32>>::method(thing, 42);
+   |     ++++++++++++++++++++++++++++++++++     ~
+LL |     <Thing<_> as Method<u32>>::method(thing, 42);
+   |     ++++++++++++++++++++++++++++++++++     ~
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/traits/issue-77982.stderr b/src/test/ui/traits/issue-77982.stderr
index 413225d45a6..414e9e580c1 100644
--- a/src/test/ui/traits/issue-77982.stderr
+++ b/src/test/ui/traits/issue-77982.stderr
@@ -36,14 +36,14 @@ LL |     opts.get(opt.as_ref());
            - impl AsRef<str> for String;
 help: use the fully qualified path for the potential candidates
    |
-LL |     opts.get(<String as AsRef<OsStr>>::as_ref(opt));
-   |              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-LL |     opts.get(<String as AsRef<Path>>::as_ref(opt));
-   |              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-LL |     opts.get(<String as AsRef<[u8]>>::as_ref(opt));
-   |              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-LL |     opts.get(<String as AsRef<str>>::as_ref(opt));
-   |              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+LL |     opts.get(<str as AsRef<Path>>::as_ref(opt));
+   |              +++++++++++++++++++++++++++++   ~
+LL |     opts.get(<str as AsRef<OsStr>>::as_ref(opt));
+   |              ++++++++++++++++++++++++++++++   ~
+LL |     opts.get(<str as AsRef<str>>::as_ref(opt));
+   |              ++++++++++++++++++++++++++++   ~
+LL |     opts.get(<str as AsRef<[u8]>>::as_ref(opt));
+   |              +++++++++++++++++++++++++++++   ~
      and 4 other candidates
 
 error[E0283]: type annotations needed