diff options
| author | Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de> | 2022-02-09 17:39:28 +0000 |
|---|---|---|
| committer | Oli Scherer <git-spam-no-reply9815368754983@oli-obk.de> | 2022-03-28 16:31:52 +0000 |
| commit | 3136bfef9319a40c95efc38409ad3e57d40882dd (patch) | |
| tree | 08e811fb648b2142dc8795789624a335cc5ba17d /src | |
| parent | d5b6510bfb8484a964428fe44e2a66eebb15e66e (diff) | |
| download | rust-3136bfef9319a40c95efc38409ad3e57d40882dd.tar.gz rust-3136bfef9319a40c95efc38409ad3e57d40882dd.zip | |
Special case the situation where the previous span is the same as the new one
Diffstat (limited to 'src')
4 files changed, 12 insertions, 24 deletions
diff --git a/src/test/ui/impl-trait/issue-86465.stderr b/src/test/ui/impl-trait/issue-86465.stderr index fc7bad60183..90d6904ed61 100644 --- a/src/test/ui/impl-trait/issue-86465.stderr +++ b/src/test/ui/impl-trait/issue-86465.stderr @@ -2,13 +2,10 @@ error: concrete type differs from previous defining opaque type use --> $DIR/issue-86465.rs:6:5 | LL | (a, a) - | ^^^^^^ expected `&'a u32`, got `&'b u32` - | -note: previous use here - --> $DIR/issue-86465.rs:6:5 - | -LL | (a, a) | ^^^^^^ + | | + | expected `&'a u32`, got `&'b u32` + | this expression supplies two conflicting concrete types for the same opaque type error: aborting due to previous error diff --git a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-infer.stderr b/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-infer.stderr index e3709d822ff..27811700912 100644 --- a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-infer.stderr +++ b/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-infer.stderr @@ -2,13 +2,10 @@ error: concrete type differs from previous defining opaque type use --> $DIR/multiple-def-uses-in-one-fn-infer.rs:10:5 | LL | (42_i64, 60) - | ^^^^^^^^^^^^ expected `i64`, got `i32` - | -note: previous use here - --> $DIR/multiple-def-uses-in-one-fn-infer.rs:10:5 - | -LL | (42_i64, 60) | ^^^^^^^^^^^^ + | | + | expected `i64`, got `i32` + | this expression supplies two conflicting concrete types for the same opaque type error: aborting due to previous error diff --git a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-lifetimes.stderr b/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-lifetimes.stderr index ed2e48e4aff..81e603e2355 100644 --- a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-lifetimes.stderr +++ b/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn-lifetimes.stderr @@ -2,13 +2,10 @@ error: concrete type differs from previous defining opaque type use --> $DIR/multiple-def-uses-in-one-fn-lifetimes.rs:6:5 | LL | (i, i) - | ^^^^^^ expected `&'a i32`, got `&'b i32` - | -note: previous use here - --> $DIR/multiple-def-uses-in-one-fn-lifetimes.rs:6:5 - | -LL | (i, i) | ^^^^^^ + | | + | expected `&'a i32`, got `&'b i32` + | this expression supplies two conflicting concrete types for the same opaque type error: aborting due to previous error diff --git a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn2.stderr b/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn2.stderr index de3f8700708..0f752212ac9 100644 --- a/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn2.stderr +++ b/src/test/ui/type-alias-impl-trait/multiple-def-uses-in-one-fn2.stderr @@ -2,13 +2,10 @@ error: concrete type differs from previous defining opaque type use --> $DIR/multiple-def-uses-in-one-fn2.rs:10:5 | LL | (a.clone(), a) - | ^^^^^^^^^^^^^^ expected `A`, got `B` - | -note: previous use here - --> $DIR/multiple-def-uses-in-one-fn2.rs:10:5 - | -LL | (a.clone(), a) | ^^^^^^^^^^^^^^ + | | + | expected `A`, got `B` + | this expression supplies two conflicting concrete types for the same opaque type error: aborting due to previous error |