clean tests/ui/entry.rs

Cleaning the empty lines for clarity.
This commit is contained in:
Luis de Bethencourt 2017-05-11 12:03:39 +01:00
parent 856d64d43e
commit 5013f49195
3 changed files with 12 additions and 34 deletions

View File

@ -6,6 +6,5 @@
enum Empty {} enum Empty {}
fn main() { fn main() {
} }

View File

@ -11,51 +11,30 @@ fn foo() {}
fn insert_if_absent0<K: Eq + Hash, V>(m: &mut HashMap<K, V>, k: K, v: V) { 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); } 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) { 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); } 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) { 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 }; 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) { 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) }; 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) { 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 }; 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) { 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) }; 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) { 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 }; 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) { fn insert_other_if_absent<K: Eq + Hash, V>(m: &mut HashMap<K, V>, k: K, o: K, v: V) {

View File

@ -11,39 +11,39 @@ note: lint level defined here
| ^^^^^^^^^ | ^^^^^^^^^
error: usage of `contains_key` followed by `insert` on a `HashMap` 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)` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `m.entry(k)`
error: usage of `contains_key` followed by `insert` on a `HashMap` 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)` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `m.entry(k)`
error: usage of `contains_key` followed by `insert` on a `HashMap` 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)` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `m.entry(k)`
error: usage of `contains_key` followed by `insert` on a `HashMap` 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)` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `m.entry(k)`
error: usage of `contains_key` followed by `insert` on a `HashMap` 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)` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `m.entry(k)`
error: usage of `contains_key` followed by `insert` on a `BTreeMap` 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)` | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: consider using `m.entry(k)`
error: aborting due to 7 previous errors error: aborting due to 7 previous errors