diff options
| author | Alexander Regueiro <alexreg@me.com> | 2018-12-29 05:45:45 +0000 |
|---|---|---|
| committer | Alexander Regueiro <alexreg@me.com> | 2018-12-29 05:45:45 +0000 |
| commit | a4fa7ef2b90880623499e86324b7b40626a02f9d (patch) | |
| tree | abd165673c92e226c36255764a7ca573499340cf | |
| parent | 5adf8c358ad70f9a50536a0bd47f938cb0aaea18 (diff) | |
| download | rust-a4fa7ef2b90880623499e86324b7b40626a02f9d.tar.gz rust-a4fa7ef2b90880623499e86324b7b40626a02f9d.zip | |
Fixed stderr files for ui tests.
| -rw-r--r-- | src/test/ui/error-codes/E0110.rs | 3 | ||||
| -rw-r--r-- | src/test/ui/error-codes/E0110.stderr | 8 | ||||
| -rw-r--r-- | src/test/ui/rfc1598-generic-associated-types/collections.stderr | 4 |
3 files changed, 3 insertions, 12 deletions
diff --git a/src/test/ui/error-codes/E0110.rs b/src/test/ui/error-codes/E0110.rs index 2de5da16ad7..764b62b8dfe 100644 --- a/src/test/ui/error-codes/E0110.rs +++ b/src/test/ui/error-codes/E0110.rs @@ -1,4 +1,3 @@ type X = u32<'static>; //~ ERROR E0110 -fn main() { -} +fn main() {} diff --git a/src/test/ui/error-codes/E0110.stderr b/src/test/ui/error-codes/E0110.stderr index be9b4229aeb..a644ac92cef 100644 --- a/src/test/ui/error-codes/E0110.stderr +++ b/src/test/ui/error-codes/E0110.stderr @@ -1,13 +1,5 @@ -<<<<<<< HEAD error[E0110]: lifetime arguments are not allowed on this entity --> $DIR/E0110.rs:1:14 -||||||| merged common ancestors -error[E0110]: lifetime parameters are not allowed on this type - --> $DIR/E0110.rs:11:14 -======= -error[E0110]: lifetime arguments are not allowed on this entity - --> $DIR/E0110.rs:11:14 ->>>>>>> Added regression test for using generic parameters on modules. | LL | type X = u32<'static>; //~ ERROR E0110 | ^^^^^^^ lifetime argument not allowed diff --git a/src/test/ui/rfc1598-generic-associated-types/collections.stderr b/src/test/ui/rfc1598-generic-associated-types/collections.stderr index b3fb81b418e..eeed04bd892 100644 --- a/src/test/ui/rfc1598-generic-associated-types/collections.stderr +++ b/src/test/ui/rfc1598-generic-associated-types/collections.stderr @@ -22,13 +22,13 @@ error[E0109]: type arguments are not allowed on this entity LL | <<Self as Collection<T>>::Family as CollectionFamily>::Member<U>; | ^ type argument not allowed -error[E0109]: type arguments are not allowed on this entity +error[E0110]: lifetime arguments are not allowed on this entity --> $DIR/collections.rs:24:50 | LL | fn iterate<'iter>(&'iter self) -> Self::Iter<'iter>; | ^^^^^ lifetime argument not allowed -error[E0109]: type arguments are not allowed on this entity +error[E0110]: lifetime arguments are not allowed on this entity --> $DIR/collections.rs:50:50 | LL | fn iterate<'iter>(&'iter self) -> Self::Iter<'iter> { |