about summary refs log tree commit diff
path: root/src/test/ui
diff options
context:
space:
mode:
authorEduard-Mihai Burtescu <edy.burt@gmail.com>2020-03-22 11:01:46 +0200
committerEduard-Mihai Burtescu <edy.burt@gmail.com>2020-04-04 06:49:20 +0300
commit64651138524b45a7e18bec7dcaf143c7fa4f2794 (patch)
tree0b03690c8acbb82b0641acc66097fa19da754a5d /src/test/ui
parentf6fe99c798cb65280a9a56f442b371adcb7b8aa2 (diff)
downloadrust-64651138524b45a7e18bec7dcaf143c7fa4f2794.tar.gz
rust-64651138524b45a7e18bec7dcaf143c7fa4f2794.zip
typeck/type_of: simplify checking of opaque types with multipler defining uses.
Diffstat (limited to 'src/test/ui')
-rw-r--r--src/test/ui/type-alias-impl-trait/generic_duplicate_param_use3.rs2
-rw-r--r--src/test/ui/type-alias-impl-trait/generic_duplicate_param_use3.stderr4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use3.rs b/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use3.rs
index 8d3e7f9f424..ec9f40851c5 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use3.rs
+++ b/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use3.rs
@@ -17,6 +17,6 @@ fn two<T: Debug, U>(t: T, _: U) -> Two<T, U> {
 }
 
 fn three<T, U: Debug>(_: T, u: U) -> Two<T, U> {
-//~^ concrete type's generic parameters differ from previous defining use
+//~^ concrete type differs from previous defining opaque type use
     u
 }
diff --git a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use3.stderr b/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use3.stderr
index 04dcdc295f9..51bee41aba3 100644
--- a/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use3.stderr
+++ b/src/test/ui/type-alias-impl-trait/generic_duplicate_param_use3.stderr
@@ -7,14 +7,14 @@ LL | |     t
 LL | | }
    | |_^
 
-error: concrete type's generic parameters differ from previous defining use
+error: concrete type differs from previous defining opaque type use
   --> $DIR/generic_duplicate_param_use3.rs:19:1
    |
 LL | / fn three<T, U: Debug>(_: T, u: U) -> Two<T, U> {
 LL | |
 LL | |     u
 LL | | }
-   | |_^ expected [`T`], got [`U`]
+   | |_^ expected `T`, got `U`
    |
 note: previous use here
   --> $DIR/generic_duplicate_param_use3.rs:15:1