about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbobtwinkles <srkoser+github@gmail.com>2018-02-07 00:46:36 -0500
committerbobtwinkles <srkoser+github@gmail.com>2018-02-07 00:46:36 -0500
commite99f8fcbc5ea4cf839575bc7ca56151147346a54 (patch)
tree606e813305b2e3eed19039651ef76df61854c2f5
parent5de094e579f8fa6c32df0690fd3e47a33c1cb6ef (diff)
downloadrust-e99f8fcbc5ea4cf839575bc7ca56151147346a54.tar.gz
rust-e99f8fcbc5ea4cf839575bc7ca56151147346a54.zip
Update trait-associated-const test to new format
-rw-r--r--src/test/ui/nll/trait-associated-constant.stderr28
1 files changed, 8 insertions, 20 deletions
diff --git a/src/test/ui/nll/trait-associated-constant.stderr b/src/test/ui/nll/trait-associated-constant.stderr
index 100e3362886..21c1a6ded93 100644
--- a/src/test/ui/nll/trait-associated-constant.stderr
+++ b/src/test/ui/nll/trait-associated-constant.stderr
@@ -9,19 +9,13 @@ error[E0308]: mismatched types
 note: the lifetime 'c as defined on the impl at 30:1...
   --> $DIR/trait-associated-constant.rs:30:1
    |
-30 | / impl<'a: 'b, 'b, 'c> Anything<'a, 'b> for FailStruct1 {
-31 | |     const AC: Option<&'c str> = None;
-32 | |     //~^ ERROR: mismatched types
-33 | | }
-   | |_^
+30 | impl<'a: 'b, 'b, 'c> Anything<'a, 'b> for FailStruct1 {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...does not necessarily outlive the lifetime 'b as defined on the impl at 30:1
   --> $DIR/trait-associated-constant.rs:30:1
    |
-30 | / impl<'a: 'b, 'b, 'c> Anything<'a, 'b> for FailStruct1 {
-31 | |     const AC: Option<&'c str> = None;
-32 | |     //~^ ERROR: mismatched types
-33 | | }
-   | |_^
+30 | impl<'a: 'b, 'b, 'c> Anything<'a, 'b> for FailStruct1 {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0308]: mismatched types
   --> $DIR/trait-associated-constant.rs:38:5
@@ -34,19 +28,13 @@ error[E0308]: mismatched types
 note: the lifetime 'a as defined on the impl at 37:1...
   --> $DIR/trait-associated-constant.rs:37:1
    |
-37 | / impl<'a: 'b, 'b> Anything<'a, 'b> for FailStruct2 {
-38 | |     const AC: Option<&'a str> = None;
-39 | |     //~^ ERROR: mismatched types
-40 | | }
-   | |_^
+37 | impl<'a: 'b, 'b> Anything<'a, 'b> for FailStruct2 {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...does not necessarily outlive the lifetime 'b as defined on the impl at 37:1
   --> $DIR/trait-associated-constant.rs:37:1
    |
-37 | / impl<'a: 'b, 'b> Anything<'a, 'b> for FailStruct2 {
-38 | |     const AC: Option<&'a str> = None;
-39 | |     //~^ ERROR: mismatched types
-40 | | }
-   | |_^
+37 | impl<'a: 'b, 'b> Anything<'a, 'b> for FailStruct2 {
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors