about summary refs log tree commit diff
path: root/src/test/ui/coherence
diff options
context:
space:
mode:
authorMichael Howell <michael@notriddle.com>2022-10-08 18:14:59 -0700
committerGitHub <noreply@github.com>2022-10-08 18:14:59 -0700
commit5ba30a680cb272d607883ebdc2da931e9b69ede7 (patch)
treeccf3f8e229034c0501b34011cf0cd8a028c2f2d5 /src/test/ui/coherence
parentbf37054b1ff25e42c077e5b52c6dc492125d8f91 (diff)
parent048e637e9ee4c9fe8813109d89f97e140776b0a4 (diff)
downloadrust-5ba30a680cb272d607883ebdc2da931e9b69ede7.tar.gz
rust-5ba30a680cb272d607883ebdc2da931e9b69ede7.zip
Rollup merge of #102514 - b-naber:binder-print-fixes, r=jackh726
Don't repeat lifetime names from outer binder in print

Fixes https://github.com/rust-lang/rust/issues/102392
Fixes https://github.com/rust-lang/rust/issues/102414

r? ```@lcnr```
Diffstat (limited to 'src/test/ui/coherence')
-rw-r--r--src/test/ui/coherence/coherence-fn-covariant-bound-vs-static.stderr4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/test/ui/coherence/coherence-fn-covariant-bound-vs-static.stderr b/src/test/ui/coherence/coherence-fn-covariant-bound-vs-static.stderr
index cfcef9699f3..7dabd97b94e 100644
--- a/src/test/ui/coherence/coherence-fn-covariant-bound-vs-static.stderr
+++ b/src/test/ui/coherence/coherence-fn-covariant-bound-vs-static.stderr
@@ -1,10 +1,10 @@
-error[E0119]: conflicting implementations of trait `Trait` for type `for<'r> fn(for<'r> fn(&'r ()))`
+error[E0119]: conflicting implementations of trait `Trait` for type `for<'r> fn(fn(&'r ()))`
   --> $DIR/coherence-fn-covariant-bound-vs-static.rs:17:1
    |
 LL | impl Trait for for<'r> fn(fn(&'r ())) {}
    | ------------------------------------- first implementation here
 LL | impl<'a> Trait for fn(fn(&'a ())) {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `for<'r> fn(for<'r> fn(&'r ()))`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `for<'r> fn(fn(&'r ()))`
    |
    = note: this behavior recently changed as a result of a bug fix; see rust-lang/rust#56105 for details