diff --git a/tests/ui/empty_enum.rs b/tests/ui/empty_enum.rs
index 9f32b7ede10..941f0e73c0a 100644
--- a/tests/ui/empty_enum.rs
+++ b/tests/ui/empty_enum.rs
@@ -6,6 +6,5 @@
 
 enum Empty {}
 
-
 fn main() {
 }
diff --git a/tests/ui/entry.rs b/tests/ui/entry.rs
index 090221ba7a8..c7ee1840904 100644
--- a/tests/ui/entry.rs
+++ b/tests/ui/entry.rs
@@ -11,51 +11,30 @@ fn foo() {}
 
 fn insert_if_absent0<K: Eq + Hash, V>(m: &mut HashMap<K, V>, k: K, v: V) {
     if !m.contains_key(&k) { m.insert(k, v); }
-
-
-
 }
 
 fn insert_if_absent1<K: Eq + Hash, V>(m: &mut HashMap<K, V>, k: K, v: V) {
     if !m.contains_key(&k) { foo(); m.insert(k, v); }
-
-
-
 }
 
 fn insert_if_absent2<K: Eq + Hash, V>(m: &mut HashMap<K, V>, k: K, v: V) {
     if !m.contains_key(&k) { m.insert(k, v) } else { None };
-
-
-
 }
 
 fn insert_if_present2<K: Eq + Hash, V>(m: &mut HashMap<K, V>, k: K, v: V) {
     if m.contains_key(&k) { None } else { m.insert(k, v) };
-
-
-
 }
 
 fn insert_if_absent3<K: Eq + Hash, V>(m: &mut HashMap<K, V>, k: K, v: V) {
     if !m.contains_key(&k) { foo(); m.insert(k, v) } else { None };
-
-
-
 }
 
 fn insert_if_present3<K: Eq + Hash, V>(m: &mut HashMap<K, V>, k: K, v: V) {
     if m.contains_key(&k) { None } else { foo(); m.insert(k, v) };
-
-
-
 }
 
 fn insert_in_btreemap<K: Ord, V>(m: &mut BTreeMap<K, V>, k: K, v: V) {
     if !m.contains_key(&k) { foo(); m.insert(k, v) } else { None };
-
-
-
 }
 
 fn insert_other_if_absent<K: Eq + Hash, V>(m: &mut HashMap<K, V>, k: K, o: K, v: V) {
diff --git a/tests/ui/entry.stderr b/tests/ui/entry.stderr
index 84edc47a714..838eb887370 100644
--- a/tests/ui/entry.stderr
+++ b/tests/ui/entry.stderr
@@ -11,39 +11,39 @@ note: lint level defined here
    |         ^^^^^^^^^
 
 error: usage of `contains_key` followed by `insert` on a `HashMap`
-  --> $DIR/entry.rs:20:5
+  --> $DIR/entry.rs:17:5
    |
-20 |     if !m.contains_key(&k) { foo(); m.insert(k, v); }
+17 |     if !m.contains_key(&k) { foo(); m.insert(k, v); }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `m.entry(k)`
 
 error: usage of `contains_key` followed by `insert` on a `HashMap`
-  --> $DIR/entry.rs:27:5
+  --> $DIR/entry.rs:21:5
    |
-27 |     if !m.contains_key(&k) { m.insert(k, v) } else { None };
+21 |     if !m.contains_key(&k) { m.insert(k, v) } else { None };
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `m.entry(k)`
 
 error: usage of `contains_key` followed by `insert` on a `HashMap`
-  --> $DIR/entry.rs:34:5
+  --> $DIR/entry.rs:25:5
    |
-34 |     if m.contains_key(&k) { None } else { m.insert(k, v) };
+25 |     if m.contains_key(&k) { None } else { m.insert(k, v) };
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `m.entry(k)`
 
 error: usage of `contains_key` followed by `insert` on a `HashMap`
-  --> $DIR/entry.rs:41:5
+  --> $DIR/entry.rs:29:5
    |
-41 |     if !m.contains_key(&k) { foo(); m.insert(k, v) } else { None };
+29 |     if !m.contains_key(&k) { foo(); m.insert(k, v) } else { None };
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `m.entry(k)`
 
 error: usage of `contains_key` followed by `insert` on a `HashMap`
-  --> $DIR/entry.rs:48:5
+  --> $DIR/entry.rs:33:5
    |
-48 |     if m.contains_key(&k) { None } else { foo(); m.insert(k, v) };
+33 |     if m.contains_key(&k) { None } else { foo(); m.insert(k, v) };
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `m.entry(k)`
 
 error: usage of `contains_key` followed by `insert` on a `BTreeMap`
-  --> $DIR/entry.rs:55:5
+  --> $DIR/entry.rs:37:5
    |
-55 |     if !m.contains_key(&k) { foo(); m.insert(k, v) } else { None };
+37 |     if !m.contains_key(&k) { foo(); m.insert(k, v) } else { None };
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `m.entry(k)`
 
 error: aborting due to 7 previous errors