squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Apply clippy::single_match suggestion

Browse source
This commit is contained in:
Mateusz Mikuła 2019-09-05 14:08:06 +02:00 committed by Mateusz Mikuła
parent 7491468278
commit bedbf3bacb
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/libcore/option.rs
View file

@ -837,9 +837,8 @@ impl<T> Option<T> {
#[inline] #[inline]
#[stable(feature = "option_entry", since = "1.20.0")] #[stable(feature = "option_entry", since = "1.20.0")]
pub fn get_or_insert_with<F: FnOnce() -> T>(&mut self, f: F) -> &mut T { pub fn get_or_insert_with<F: FnOnce() -> T>(&mut self, f: F) -> &mut T {
match *self { if let None = *self {
None => *self = Some(f()), *self = Some(f());
_ => (),
} }
match *self { match *self {

5
src/libstd/thread/local.rs
View file

@ -509,9 +509,8 @@ pub mod os {
pub unsafe fn get(&'static self, init: fn() -> T) -> Option<&'static T> { pub unsafe fn get(&'static self, init: fn() -> T) -> Option<&'static T> {
let ptr = self.os.get() as *mut Value<T>; let ptr = self.os.get() as *mut Value<T>;
if ptr as usize > 1 { if ptr as usize > 1 {
match (*ptr).inner.get() { if let Some(ref value) = (*ptr).inner.get() {
Some(ref value) => return Some(value), return Some(value);
None => {},
} }
} }
self.try_initialize(init) self.try_initialize(init)