Fix rebase

Author: petrochenkov

src/librustc/session/mod.rs

@@ -909,13 +909,14 @@ pub fn build_session_with_codemap(sopts: config::Options,
 
     let emitter: Box<Emitter> = match (sopts.error_format, emitter_dest) {
         (config::ErrorOutputType::HumanReadable(color_config), None) => {
-            Box::new(EmitterWriter::stderr(color_config,
-                                           Some(codemap.clone()),
-                                           false,
-                                           sopts.debugging_opts.teach))
+            Box::new(EmitterWriter::stderr(color_config, Some(codemap.clone()),
+                     false, sopts.debugging_opts.teach)
+                     .ui_testing(sopts.debugging_opts.ui_testing))
         }
         (config::ErrorOutputType::HumanReadable(_), Some(dst)) => {
-            Box::new(EmitterWriter::new(dst, Some(codemap.clone()), false, false))
+            Box::new(EmitterWriter::new(dst, Some(codemap.clone()),
+                     false, false)
+                     .ui_testing(sopts.debugging_opts.ui_testing))
         }
         (config::ErrorOutputType::Json(pretty), None) => {
             Box::new(JsonEmitter::stderr(Some(registry), codemap.clone(),

src/librustc_errors/emitter.rs

@@ -189,8 +189,9 @@ impl EmitterWriter {
         }
     }
 
-    pub fn ui_testing(self, ui_testing: bool) -> Self {
-        Self { ui_testing, ..self }
+    pub fn ui_testing(mut self, ui_testing: bool) -> Self {
+        self.ui_testing = ui_testing;
+        self
     }
 
     fn maybe_anonymized(&self, line_num: usize) -> String {

src/test/ui-fulldeps/proc-macro/load-panic.stderr

@@ -1,7 +1,7 @@
 error: proc-macro derive panicked
   --> $DIR/load-panic.rs:17:10
    |
-17 | #[derive(A)]
+LL | #[derive(A)]
    |          ^
    |
    = help: message: nope!

src/test/ui/command-line-diagnostics.stderr

@@ -1,9 +1,9 @@
 error[E0384]: cannot assign twice to immutable variable `x`
   --> $DIR/command-line-diagnostics.rs:16:5
    |
-15 |     let x = 42;
+LL |     let x = 42;
    |         - first assignment to `x`
-16 |     x = 43;
+LL |     x = 43;
    |     ^^^^^^ cannot assign twice to immutable variable
 
 error: aborting due to previous error

src/test/ui/did_you_mean/issue-42599_available_fields_note.stderr

@@ -1,13 +1,13 @@
 error[E0560]: struct `submodule::Demo` has no field named `inocently_mispellable`
   --> $DIR/issue-42599_available_fields_note.rs:26:39
    |
-26 |             Self { secret_integer: 2, inocently_mispellable: () }
+LL |             Self { secret_integer: 2, inocently_mispellable: () }
    |                                       ^^^^^^^^^^^^^^^^^^^^^ field does not exist - did you mean `innocently_misspellable`?
 
 error[E0560]: struct `submodule::Demo` has no field named `egregiously_nonexistent_field`
   --> $DIR/issue-42599_available_fields_note.rs:31:39
    |
-31 |             Self { secret_integer: 3, egregiously_nonexistent_field: () }
+LL |             Self { secret_integer: 3, egregiously_nonexistent_field: () }
    |                                       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ `submodule::Demo` does not have this field
    |
    = note: available fields are: `favorite_integer`, `secret_integer`, `innocently_misspellable`, `another_field`, `yet_another_field` ... and 2 others

src/test/ui/error-codes/E0062.stderr

@@ -3,7 +3,7 @@ error[E0062]: field `x` specified more than once
    |
 LL |         x: 0,
    |         ---- first use of `x`
-18 |         x: 0,
+LL |         x: 0,
    |         ^ used more than once
 
 error: aborting due to previous error

src/test/ui/error-codes/E0559.stderr

@@ -1,7 +1,7 @@
 error[E0559]: variant `Field::Fool` has no field named `joke`
   --> $DIR/E0559.rs:16:27
    |
-16 |     let s = Field::Fool { joke: 0 };
+LL |     let s = Field::Fool { joke: 0 };
    |                           ^^^^ `Field::Fool` does not have this field
    |
    = note: available fields are: `x`

src/test/ui/error-codes/E0560.stderr

@@ -1,7 +1,7 @@
 error[E0560]: struct `Simba` has no field named `father`
   --> $DIR/E0560.rs:16:32
    |
-16 |     let s = Simba { mother: 1, father: 0 };
+LL |     let s = Simba { mother: 1, father: 0 };
    |                                ^^^^^^ `Simba` does not have this field
    |
    = note: available fields are: `mother`

src/test/ui/error-codes/E0657.stderr

@@ -1,14 +1,14 @@
 error[E0657]: `impl Trait` can only capture lifetimes bound at the fn or impl level
   --> $DIR/E0657.rs:20:31
    |
-LL |     -> impl for<'a> Id<impl Lt<'a>>
-   |                                ^^
+LL |     -> Box<for<'a> Id<impl Lt<'a>>>
+   |                               ^^
 
 error[E0657]: `impl Trait` can only capture lifetimes bound at the fn or impl level
   --> $DIR/E0657.rs:29:35
    |
-LL |         -> impl for<'a> Id<impl Lt<'a>>
-   |                                    ^^
+LL |         -> Box<for<'a> Id<impl Lt<'a>>>
+   |                                   ^^
 
 error: aborting due to 2 previous errors
 

src/test/ui/error-festival.stderr

@@ -1,73 +1,73 @@
 error[E0425]: cannot find value `y` in this scope
   --> $DIR/error-festival.rs:24:5
    |
-24 |     y = 2;
+LL |     y = 2;
    |     ^ did you mean `x`?
 
 error[E0603]: constant `FOO` is private
   --> $DIR/error-festival.rs:32:5
    |
-32 |     foo::FOO;
+LL |     foo::FOO;
    |     ^^^^^^^^
 
 error[E0368]: binary assignment operation `+=` cannot be applied to type `&str`
   --> $DIR/error-festival.rs:22:5
    |
-22 |     x += 2;
+LL |     x += 2;
    |     -^^^^^
    |     |
    |     cannot use `+=` on type `&str`
 
 error[E0599]: no method named `z` found for type `&str` in the current scope
   --> $DIR/error-festival.rs:26:7
    |
-26 |     x.z();
+LL |     x.z();
    |       ^
 
 error[E0600]: cannot apply unary operator `!` to type `Question`
   --> $DIR/error-festival.rs:29:5
    |
-29 |     !Question::Yes;
+LL |     !Question::Yes;
    |     ^^^^^^^^^^^^^^
 
 error[E0604]: only `u8` can be cast as `char`, not `u32`
   --> $DIR/error-festival.rs:35:5
    |
-35 |     0u32 as char;
+LL |     0u32 as char;
    |     ^^^^^^^^^^^^
 
 error[E0605]: non-primitive cast: `u8` as `std::vec::Vec<u8>`
   --> $DIR/error-festival.rs:39:5
    |
-39 |     x as Vec<u8>;
+LL |     x as Vec<u8>;
    |     ^^^^^^^^^^^^
    |
    = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait
 
 error[E0054]: cannot cast as `bool`
   --> $DIR/error-festival.rs:43:24
    |
-43 |     let x_is_nonzero = x as bool;
+LL |     let x_is_nonzero = x as bool;
    |                        ^^^^^^^^^ unsupported cast
    |
    = help: compare with zero instead
 
 error[E0606]: casting `&u8` as `u32` is invalid
   --> $DIR/error-festival.rs:47:18
    |
-47 |     let y: u32 = x as u32;
+LL |     let y: u32 = x as u32;
    |                  ^^^^^^^^ cannot cast `&u8` as `u32`
    |
 help: did you mean `*x`?
   --> $DIR/error-festival.rs:47:18
    |
-47 |     let y: u32 = x as u32;
+LL |     let y: u32 = x as u32;
    |                  ^
 
 error[E0607]: cannot cast thin pointer `*const u8` to fat pointer `*const [u8]`
   --> $DIR/error-festival.rs:51:5
    |
-51 |     v as *const [u8];
+LL |     v as *const [u8];
    |     ^^^^^^^^^^^^^^^^
 
 error: aborting due to 10 previous errors