summary refs log tree commit diff
path: root/src/test/ui/parser
diff options
context:
space:
mode:
authorAlexander Regueiro <alexreg@me.com>2019-03-30 22:06:09 +0000
committerAlexander Regueiro <alexreg@me.com>2019-05-20 16:12:49 +0100
commitfd7c253accd46ea8340feb79ecaf18d99f518bb8 (patch)
treefeea292bca793ad38ae2204f0a8d7c692d613b34 /src/test/ui/parser
parentaea954b74de16888f09ff003ebfdf97f9f7ef001 (diff)
downloadrust-fd7c253accd46ea8340feb79ecaf18d99f518bb8.tar.gz
rust-fd7c253accd46ea8340feb79ecaf18d99f518bb8.zip
Update tests.
Diffstat (limited to 'src/test/ui/parser')
-rw-r--r--src/test/ui/parser/trait-object-trait-parens.rs4
-rw-r--r--src/test/ui/parser/trait-object-trait-parens.stderr16
2 files changed, 3 insertions, 17 deletions
diff --git a/src/test/ui/parser/trait-object-trait-parens.rs b/src/test/ui/parser/trait-object-trait-parens.rs
index 2bbc5800015..49373564f67 100644
--- a/src/test/ui/parser/trait-object-trait-parens.rs
+++ b/src/test/ui/parser/trait-object-trait-parens.rs
@@ -4,9 +4,7 @@ fn f<T: (Copy) + (?Sized) + (for<'a> Trait<'a>)>() {}
 
 fn main() {
     let _: Box<(Copy) + (?Sized) + (for<'a> Trait<'a>)>;
-    //~^ ERROR `?Trait` is not permitted in trait object types
     let _: Box<(?Sized) + (for<'a> Trait<'a>) + (Copy)>;
     let _: Box<(for<'a> Trait<'a>) + (Copy) + (?Sized)>;
-    //~^ ERROR `?Trait` is not permitted in trait object types
-    //~| ERROR use of undeclared lifetime name `'a`
+    //~^ ERROR use of undeclared lifetime name `'a`
 }
diff --git a/src/test/ui/parser/trait-object-trait-parens.stderr b/src/test/ui/parser/trait-object-trait-parens.stderr
index 36494b76539..1cf40b30406 100644
--- a/src/test/ui/parser/trait-object-trait-parens.stderr
+++ b/src/test/ui/parser/trait-object-trait-parens.stderr
@@ -1,21 +1,9 @@
-error: `?Trait` is not permitted in trait object types
-  --> $DIR/trait-object-trait-parens.rs:6:25
-   |
-LL |     let _: Box<(Copy) + (?Sized) + (for<'a> Trait<'a>)>;
-   |                         ^^^^^^^^
-
-error: `?Trait` is not permitted in trait object types
-  --> $DIR/trait-object-trait-parens.rs:9:47
-   |
-LL |     let _: Box<(for<'a> Trait<'a>) + (Copy) + (?Sized)>;
-   |                                               ^^^^^^^^
-
 error[E0261]: use of undeclared lifetime name `'a`
-  --> $DIR/trait-object-trait-parens.rs:9:31
+  --> $DIR/trait-object-trait-parens.rs:8:31
    |
 LL |     let _: Box<(for<'a> Trait<'a>) + (Copy) + (?Sized)>;
    |                               ^^ undeclared lifetime
 
-error: aborting due to 3 previous errors
+error: aborting due to previous error
 
 For more information about this error, try `rustc --explain E0261`.