6 files changed, 3 insertions, 33 deletions
diff --git a/src/test/ui/derived-errors/issue-30580.rs b/src/test/ui/derived-errors/issue-30580.rs
index 553ad0a3341..6940fcf7c3a 100644
--- a/src/test/ui/derived-errors/issue-30580.rs
+++ b/src/test/ui/derived-errors/issue-30580.rs
@@ -1,13 +1,3 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // Test that we do not see uninformative region-related errors
 // when we get some basic type-checking failure. See #30580.
 
diff --git a/src/test/ui/derived-errors/issue-30580.stderr b/src/test/ui/derived-errors/issue-30580.stderr
index bf9a5a299e3..d4829ad2a1a 100644
--- a/src/test/ui/derived-errors/issue-30580.stderr
+++ b/src/test/ui/derived-errors/issue-30580.stderr
@@ -1,5 +1,5 @@
 error[E0609]: no field `c` on type `&Foo`
-  --> $DIR/issue-30580.rs:22:11
+  --> $DIR/issue-30580.rs:12:11
    |
 LL |         b.c; //~ ERROR no field `c` on type `&Foo`
    |           ^
diff --git a/src/test/ui/derived-errors/issue-31997-1.rs b/src/test/ui/derived-errors/issue-31997-1.rs
index 7d79c48c06a..90c1b498cea 100644
--- a/src/test/ui/derived-errors/issue-31997-1.rs
+++ b/src/test/ui/derived-errors/issue-31997-1.rs
@@ -1,13 +1,3 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // Regression test for this example from #31997 -- main goal is to
 // emit as minimal and precise an error set as possible. Ideally, we'd
 // only emit the E0433 error below, but right now we emit two.
diff --git a/src/test/ui/derived-errors/issue-31997-1.stderr b/src/test/ui/derived-errors/issue-31997-1.stderr
index 5c5422f091b..6df748122a2 100644
--- a/src/test/ui/derived-errors/issue-31997-1.stderr
+++ b/src/test/ui/derived-errors/issue-31997-1.stderr
@@ -1,5 +1,5 @@
 error[E0433]: failed to resolve: use of undeclared type or module `HashMap`
-  --> $DIR/issue-31997-1.rs:30:19
+  --> $DIR/issue-31997-1.rs:20:19
    |
 LL |     let mut map = HashMap::new();
    |                   ^^^^^^^ use of undeclared type or module `HashMap`
diff --git a/src/test/ui/derived-errors/issue-31997.rs b/src/test/ui/derived-errors/issue-31997.rs
index 2e1d3c55a8f..025e9100e23 100644
--- a/src/test/ui/derived-errors/issue-31997.rs
+++ b/src/test/ui/derived-errors/issue-31997.rs
@@ -1,13 +1,3 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
 // Test that the resolve failure does not lead to downstream type errors.
 // See issue #31997.
 
diff --git a/src/test/ui/derived-errors/issue-31997.stderr b/src/test/ui/derived-errors/issue-31997.stderr
index 25088e8654b..246e6f6465c 100644
--- a/src/test/ui/derived-errors/issue-31997.stderr
+++ b/src/test/ui/derived-errors/issue-31997.stderr
@@ -1,5 +1,5 @@
 error[E0425]: cannot find function `bar` in this scope
-  --> $DIR/issue-31997.rs:23:21
+  --> $DIR/issue-31997.rs:13:21
    |
 LL |     try!(closure(|| bar(0 as *mut _))); //~ ERROR cannot find function `bar` in this scope
    |                     ^^^ not found in this scope