Merge pull request RustPython#3844 from coolreader18/then_some

Switch then(|| foo) to then_some(foo)

Author: youknowone

parser/build.rs

@@ -18,7 +18,7 @@ fn check_lalrpop(source: &str, generated: &str) {
         .lines()
         .find_map(|line| {
             let line = line.unwrap();
-            line.starts_with(sha_prefix).then(|| line)
+            line.starts_with(sha_prefix).then_some(line)
         })
         .expect("no sha3 line?");
     let expected_sha3_str = sha3_line.strip_prefix(sha_prefix).unwrap();

stdlib/src/array.rs

@@ -1271,7 +1271,7 @@ mod array {
 
         fn try_resizable_opt(&'a self) -> Option<Self::Resizable> {
             let w = self.write();
-            (self.exports.load(atomic::Ordering::SeqCst) == 0).then(|| w)
+            (self.exports.load(atomic::Ordering::SeqCst) == 0).then_some(w)
         }
     }
 

vm/src/builtins/bytearray.rs

@@ -762,7 +762,7 @@ impl<'a> BufferResizeGuard<'a> for PyByteArray {
 
     fn try_resizable_opt(&'a self) -> Option<Self::Resizable> {
         let w = self.inner.write();
-        (self.exports.load(Ordering::SeqCst) == 0).then(|| w)
+        (self.exports.load(Ordering::SeqCst) == 0).then_some(w)
     }
 }
 

vm/src/object/core.rs

@@ -251,7 +251,7 @@ impl WeakRefList {
                 })
             }
             inner.ref_count -= 1;
-            (inner.ref_count == 0).then(|| ptr)
+            (inner.ref_count == 0).then_some(ptr)
         };
         if let Some(ptr) = to_dealloc {
             unsafe { WeakRefList::dealloc(ptr) }

vm/src/stdlib/io.rs

@@ -3374,7 +3374,7 @@ mod _io {
 
         fn try_resizable_opt(&'a self) -> Option<Self::Resizable> {
             let w = self.buffer.write();
-            (self.exports.load() == 0).then(|| w)
+            (self.exports.load() == 0).then_some(w)
         }
     }