Skip to content

Commit b742d7e

Browse files
authored
Rollup merge of #61313 - Centril:simplify-set1-insert, r=varkor
Simplify Set1::insert r? @varkor
2 parents 1896756 + 3f3087b commit b742d7e

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

src/librustc/middle/resolve_lifetime.rs

+5-10
Original file line numberDiff line numberDiff line change
@@ -170,16 +170,11 @@ pub enum Set1<T> {
170170

171171
impl<T: PartialEq> Set1<T> {
172172
pub fn insert(&mut self, value: T) {
173-
if let Set1::Empty = *self {
174-
*self = Set1::One(value);
175-
return;
176-
}
177-
if let Set1::One(ref old) = *self {
178-
if *old == value {
179-
return;
180-
}
181-
}
182-
*self = Set1::Many;
173+
*self = match self {
174+
Set1::Empty => Set1::One(value),
175+
Set1::One(old) if *old == value => return,
176+
_ => Set1::Many,
177+
};
183178
}
184179
}
185180

0 commit comments

Comments
 (0)