Use Option::map_or instead of open coding it

LingMan · LingMan · commit 7943c9c44672 · 2021-10-12T14:47:52.000+02:00
diff --git a/compiler/rustc_index/src/bit_set.rs b/compiler/rustc_index/src/bit_set.rs
@@ -841,7 +841,7 @@ impl<T: Idx> GrowableBitSet<T> {
     #[inline]
     pub fn contains(&self, elem: T) -> bool {
         let (word_index, mask) = word_index_and_mask(elem);
-        if let Some(word) = self.bit_set.words.get(word_index) { (word & mask) != 0 } else { false }
+        self.bit_set.words.get(word_index).map_or(false, |word| (word & mask) != 0)
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -841,7 +841,7 @@ impl<T: Idx> GrowableBitSet<T> {`
`841`	`841`	`#[inline]`
`842`	`842`	`pub fn contains(&self, elem: T) -> bool {`
`843`	`843`	`let (word_index, mask) = word_index_and_mask(elem);`
`844`		`- if let Some(word) = self.bit_set.words.get(word_index) { (word & mask) != 0 } else { false }`
	`844`	`+ self.bit_set.words.get(word_index).map_or(false, \|word\| (word & mask) != 0)`
`845`	`845`	`}`
`846`	`846`	`}`
`847`	`847`