Skip to content

Commit 2325615

Browse files
committed
Remove useless matches from tests
1 parent 04eef87 commit 2325615

File tree

1 file changed

+18
-36
lines changed

1 file changed

+18
-36
lines changed

src/map.rs

Lines changed: 18 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3912,18 +3912,11 @@ mod test_map {
39123912
let value = "an initial value";
39133913
let new_value = "a new value";
39143914

3915-
a.insert(key, value);
3916-
3917-
match a.entry(key) {
3918-
Occupied(e) => {
3919-
e.replace_entry_with(|k, v| {
3920-
assert_eq!(k, &key);
3921-
assert_eq!(v, value);
3922-
Some(new_value)
3923-
});
3924-
}
3925-
Vacant(_) => unreachable!(),
3926-
}
3915+
a.entry(key).insert(value).replace_entry_with(|k, v| {
3916+
assert_eq!(k, &key);
3917+
assert_eq!(v, value);
3918+
Some(new_value)
3919+
});
39273920

39283921
assert_eq!(a[key], new_value);
39293922
assert_eq!(a.len(), 1);
@@ -3951,12 +3944,8 @@ mod test_map {
39513944
let value = "an initial value";
39523945
let new_value = "a new value";
39533946

3954-
match a.entry(key) {
3955-
e @ Vacant(_) => {
3956-
e.and_replace_entry_with(|_, _| panic!("Can't replace a VacantEntry"));
3957-
}
3958-
Occupied(_) => unreachable!(),
3959-
}
3947+
a.entry(key)
3948+
.and_replace_entry_with(|_, _| panic!("Can't replace a VacantEntry"));
39603949

39613950
a.insert(key, value);
39623951

@@ -3987,18 +3976,14 @@ mod test_map {
39873976
let value = "an initial value";
39883977
let new_value = "a new value";
39893978

3990-
a.insert(key, value);
3991-
3992-
match a.raw_entry_mut().from_key(&key) {
3993-
RawEntryMut::Occupied(e) => {
3994-
e.replace_entry_with(|k, v| {
3995-
assert_eq!(k, &key);
3996-
assert_eq!(v, value);
3997-
Some(new_value)
3998-
});
3999-
}
4000-
RawEntryMut::Vacant(_) => unreachable!(),
4001-
}
3979+
a.raw_entry_mut()
3980+
.from_key(&key)
3981+
.insert(key, value)
3982+
.replace_entry_with(|k, v| {
3983+
assert_eq!(k, &key);
3984+
assert_eq!(v, value);
3985+
Some(new_value)
3986+
});
40023987

40033988
assert_eq!(a[key], new_value);
40043989
assert_eq!(a.len(), 1);
@@ -4026,12 +4011,9 @@ mod test_map {
40264011
let value = "an initial value";
40274012
let new_value = "a new value";
40284013

4029-
match a.raw_entry_mut().from_key(&key) {
4030-
e @ RawEntryMut::Vacant(_) => {
4031-
e.and_replace_entry_with(|_, _| panic!("Can't replace a VacantEntry"));
4032-
}
4033-
RawEntryMut::Occupied(_) => unreachable!(),
4034-
}
4014+
a.raw_entry_mut()
4015+
.from_key(&key)
4016+
.and_replace_entry_with(|_, _| panic!("Can't replace a VacantEntry"));
40354017

40364018
a.insert(key, value);
40374019

0 commit comments

Comments
 (0)