about summary refs log tree commit diff
path: root/src/test/ui/generics
diff options
context:
space:
mode:
authorlcnr <rust@lcnr.de>2021-03-01 12:50:09 +0100
committerkadmin <julianknodt@gmail.com>2021-03-23 17:16:20 +0000
commitb0feb5be2f045a7611845b92113f7f720c32ae95 (patch)
treee7de52e5c76f1cef681e1b4f7522421367eaa048 /src/test/ui/generics
parent8ef81388e2def7b12d3b527705bf32402c8d7c8a (diff)
downloadrust-b0feb5be2f045a7611845b92113f7f720c32ae95.tar.gz
rust-b0feb5be2f045a7611845b92113f7f720c32ae95.zip
progress, stuff compiles now
Diffstat (limited to 'src/test/ui/generics')
-rw-r--r--src/test/ui/generics/generic-non-trailing-defaults.rs6
-rw-r--r--src/test/ui/generics/generic-non-trailing-defaults.stderr4
-rw-r--r--src/test/ui/generics/generic-type-params-forward-mention.rs2
3 files changed, 6 insertions, 6 deletions
diff --git a/src/test/ui/generics/generic-non-trailing-defaults.rs b/src/test/ui/generics/generic-non-trailing-defaults.rs
index 8d9883dc7a9..bd076b1f725 100644
--- a/src/test/ui/generics/generic-non-trailing-defaults.rs
+++ b/src/test/ui/generics/generic-non-trailing-defaults.rs
@@ -1,10 +1,10 @@
 struct Heap;
 
 struct Vec<A = Heap, T>(A, T);
-//~^ ERROR type parameters with a default must be trailing
+//~^ ERROR generic parameters with a default must be trailing
 
 struct Foo<A, B = Vec<C>, C>(A, B, C);
-//~^ ERROR type parameters with a default must be trailing
-//~| ERROR type parameters with a default cannot use forward declared identifiers
+//~^ ERROR generic parameters with a default must be trailing
+//~| ERROR generic parameters with a default cannot use forward declared identifiers
 
 fn main() {}
diff --git a/src/test/ui/generics/generic-non-trailing-defaults.stderr b/src/test/ui/generics/generic-non-trailing-defaults.stderr
index 33dd4429722..6d768617503 100644
--- a/src/test/ui/generics/generic-non-trailing-defaults.stderr
+++ b/src/test/ui/generics/generic-non-trailing-defaults.stderr
@@ -1,10 +1,10 @@
-error: type parameters with a default must be trailing
+error: generic parameters with a default must be trailing
   --> $DIR/generic-non-trailing-defaults.rs:3:12
    |
 LL | struct Vec<A = Heap, T>(A, T);
    |            ^
 
-error: type parameters with a default must be trailing
+error: generic parameters with a default must be trailing
   --> $DIR/generic-non-trailing-defaults.rs:6:15
    |
 LL | struct Foo<A, B = Vec<C>, C>(A, B, C);
diff --git a/src/test/ui/generics/generic-type-params-forward-mention.rs b/src/test/ui/generics/generic-type-params-forward-mention.rs
index ac0cab20d78..000c47095d2 100644
--- a/src/test/ui/generics/generic-type-params-forward-mention.rs
+++ b/src/test/ui/generics/generic-type-params-forward-mention.rs
@@ -1,6 +1,6 @@
 // Ensure that we get an error and not an ICE for this problematic case.
 struct Foo<T = Option<U>, U = bool>(T, U);
-//~^ ERROR type parameters with a default cannot use forward declared identifiers
+//~^ ERROR generic parameters with a default cannot use forward declared identifiers
 fn main() {
     let x: Foo;
 }