Satisfy tidy

Author: TimDiekmann

src/libcore/ptr.rs

@@ -2902,7 +2902,7 @@ impl<T: Sized> NonNull<T> {
             NonNull::new_unchecked(ptr)
         }
     }
-    
+
     /// Creates a new `NonNull` that is dangling, but well-aligned.
     ///
     /// This is useful for initializing types which lazily allocate, like

src/test/run-pass/consts/const-ptr-nonnull.rs

@@ -14,7 +14,7 @@ const fn cast<T, U>(non_null: NonNull<T>) -> NonNull<U> {
 
 pub fn main() {
     assert_eq!(dangling(), NonNull::dangling());
-    
+
     let mut i: i32 = 10;
     let non_null_t = NonNull::new(&mut i).unwrap();
     let non_null_u: NonNull<u32> = cast(non_null_t);

src/test/ui/consts/const-ptr-nonnull.rs

@@ -1,9 +1,11 @@
 use std::ptr::NonNull;
 
 fn main() {
-    let x: &'static NonNull<u32> = &(NonNull::dangling()); //~ ERROR borrowed value does not live long enough
-    
+    let x: &'static NonNull<u32> = &(NonNull::dangling());
+    //~^ ERROR borrowed value does not live long enough
+
     let mut i: i32 = 10;
     let non_null = NonNull::new(&mut i).unwrap();
-    let x: &'static NonNull<u32> = &(non_null.cast()); //~ ERROR borrowed value does not live long enough
+    let x: &'static NonNull<u32> = &(non_null.cast());
+    //~^ ERROR borrowed value does not live long enough
 }

src/test/ui/consts/const-ptr-nonnull.stderr

@@ -1,7 +1,7 @@
 error[E0597]: borrowed value does not live long enough
   --> $DIR/const-ptr-nonnull.rs:4:37
    |
-LL |     let x: &'static NonNull<u32> = &(NonNull::dangling()); //~ ERROR borrowed value does not live long enough
+LL |     let x: &'static NonNull<u32> = &(NonNull::dangling());
    |                                     ^^^^^^^^^^^^^^^^^^^^^ temporary value does not live long enough
 ...
 LL | }
@@ -10,10 +10,11 @@ LL | }
    = note: borrowed value must be valid for the static lifetime...
 
 error[E0597]: borrowed value does not live long enough
-  --> $DIR/const-ptr-nonnull.rs:8:37
+  --> $DIR/const-ptr-nonnull.rs:9:37
    |
-LL |     let x: &'static NonNull<u32> = &(non_null.cast()); //~ ERROR borrowed value does not live long enough
+LL |     let x: &'static NonNull<u32> = &(non_null.cast());
    |                                     ^^^^^^^^^^^^^^^^^ temporary value does not live long enough
+LL |     //~^ ERROR borrowed value does not live long enough
 LL | }
    | - temporary value only lives until here
    |

src/test/ui/consts/const-ptr-unique.rs

@@ -5,5 +5,6 @@ use std::ptr::Unique;
 fn main() {
     let mut i: u32 = 10;
     let unique = Unique::new(&mut i).unwrap();
-    let x: &'static *mut u32 = &(unique.as_ptr()); //~ ERROR borrowed value does not live long enough
+    let x: &'static *mut u32 = &(unique.as_ptr());
+    //~^ ERROR borrowed value does not live long enough
 }

src/test/ui/consts/const-ptr-unique.stderr

@@ -1,8 +1,9 @@
 error[E0597]: borrowed value does not live long enough
   --> $DIR/const-ptr-unique.rs:8:33
    |
-LL |     let x: &'static *mut u32 = &(unique.as_ptr()); //~ ERROR borrowed value does not live long enough
+LL |     let x: &'static *mut u32 = &(unique.as_ptr());
    |                                 ^^^^^^^^^^^^^^^^^ temporary value does not live long enough
+LL |     //~^ ERROR borrowed value does not live long enough
 LL | }
    | - temporary value only lives until here
    |