pacify the mercilous tidy: adt-nullary-enums test

Author: nikomatsakis

src/test/ui/nll/user-annotations/adt-nullary-enums.rs

@@ -40,12 +40,18 @@ fn annot_reference_any_lifetime() {
 
 fn annot_reference_static_lifetime() {
     let c = 66;
-    combine(SomeEnum::SomeVariant(Cell::new(&c)), SomeEnum::SomeOtherVariant::<Cell<&'static u32>>); //~ ERROR
+    combine(
+        SomeEnum::SomeVariant(Cell::new(&c)), //~ ERROR
+        SomeEnum::SomeOtherVariant::<Cell<&'static u32>>,
+    );
 }
 
 fn annot_reference_named_lifetime<'a>(_d: &'a u32) {
     let c = 66;
-    combine(SomeEnum::SomeVariant(Cell::new(&c)), SomeEnum::SomeOtherVariant::<Cell<&'a u32>>); //~ ERROR
+    combine(
+        SomeEnum::SomeVariant(Cell::new(&c)), //~ ERROR
+        SomeEnum::SomeOtherVariant::<Cell<&'a u32>>,
+    );
 }
 
 fn annot_reference_named_lifetime_ok<'a>(c: &'a u32) {
@@ -55,13 +61,19 @@ fn annot_reference_named_lifetime_ok<'a>(c: &'a u32) {
 fn annot_reference_named_lifetime_in_closure<'a>(_: &'a u32) {
     let _closure = || {
         let c = 66;
-        combine(SomeEnum::SomeVariant(Cell::new(&c)), SomeEnum::SomeOtherVariant::<Cell<&'a u32>>); //~ ERROR
+        combine(
+            SomeEnum::SomeVariant(Cell::new(&c)), //~ ERROR
+            SomeEnum::SomeOtherVariant::<Cell<&'a u32>>,
+        );
     };
 }
 
 fn annot_reference_named_lifetime_in_closure_ok<'a>(c: &'a u32) {
     let _closure = || {
-        combine(SomeEnum::SomeVariant(Cell::new(c)), SomeEnum::SomeOtherVariant::<Cell<&'a u32>>);
+        combine(
+            SomeEnum::SomeVariant(Cell::new(c)),
+            SomeEnum::SomeOtherVariant::<Cell<&'a u32>>,
+        );
     };
 }
 

src/test/ui/nll/user-annotations/adt-nullary-enums.stderr

@@ -1,37 +1,40 @@
 error[E0597]: `c` does not live long enough
-  --> $DIR/adt-nullary-enums.rs:43:45
+  --> $DIR/adt-nullary-enums.rs:44:41
    |
-LL |     combine(SomeEnum::SomeVariant(Cell::new(&c)), SomeEnum::SomeOtherVariant::<Cell<&'static u32>>); //~ ERROR
-   |                                             ^^ borrowed value does not live long enough
+LL |         SomeEnum::SomeVariant(Cell::new(&c)), //~ ERROR
+   |                                         ^^ borrowed value does not live long enough
+...
 LL | }
    | - `c` dropped here while still borrowed
    |
    = note: borrowed value must be valid for the static lifetime...
 
 error[E0597]: `c` does not live long enough
-  --> $DIR/adt-nullary-enums.rs:48:45
+  --> $DIR/adt-nullary-enums.rs:52:41
    |
-LL |     combine(SomeEnum::SomeVariant(Cell::new(&c)), SomeEnum::SomeOtherVariant::<Cell<&'a u32>>); //~ ERROR
-   |                                             ^^ borrowed value does not live long enough
+LL |         SomeEnum::SomeVariant(Cell::new(&c)), //~ ERROR
+   |                                         ^^ borrowed value does not live long enough
+...
 LL | }
    | - `c` dropped here while still borrowed
    |
-note: borrowed value must be valid for the lifetime 'a as defined on the function body at 46:35...
-  --> $DIR/adt-nullary-enums.rs:46:35
+note: borrowed value must be valid for the lifetime 'a as defined on the function body at 49:35...
+  --> $DIR/adt-nullary-enums.rs:49:35
    |
 LL | fn annot_reference_named_lifetime<'a>(_d: &'a u32) {
    |                                   ^^
 
 error[E0597]: `c` does not live long enough
-  --> $DIR/adt-nullary-enums.rs:58:49
+  --> $DIR/adt-nullary-enums.rs:65:45
    |
-LL |         combine(SomeEnum::SomeVariant(Cell::new(&c)), SomeEnum::SomeOtherVariant::<Cell<&'a u32>>); //~ ERROR
-   |                                                 ^^ borrowed value does not live long enough
+LL |             SomeEnum::SomeVariant(Cell::new(&c)), //~ ERROR
+   |                                             ^^ borrowed value does not live long enough
+...
 LL |     };
    |     - `c` dropped here while still borrowed
    |
-note: borrowed value must be valid for the lifetime 'a as defined on the function body at 55:46...
-  --> $DIR/adt-nullary-enums.rs:55:46
+note: borrowed value must be valid for the lifetime 'a as defined on the function body at 61:46...
+  --> $DIR/adt-nullary-enums.rs:61:46
    |
 LL | fn annot_reference_named_lifetime_in_closure<'a>(_: &'a u32) {
    |                                              ^^