Use bool::then_some

Author: Philippe-Cholet

benches/specializations.rs

@@ -654,7 +654,7 @@ bench_specializations! {
                 .map(|x| if x % 2 == 1 { Err(x) } else { Ok(x) })
                 .collect_vec());
         }
-        v.iter().copied().filter_map_ok(|x| if x % 3 == 0 { Some(x + 1) } else { None })
+        v.iter().copied().filter_map_ok(|x| (x % 3 == 0).then_some(x + 1))
     }
     flatten_ok {
         DoubleEndedIterator

tests/laziness.rs

@@ -122,13 +122,7 @@ must_use_tests! {
         let _ = Panicking.map(Ok::<u8, ()>).filter_ok(|x| x % 2 == 0);
     }
     filter_map_ok {
-        let _ = Panicking.map(Ok::<u8, ()>).filter_map_ok(|x| {
-            if x % 2 == 0 {
-                Some(x + 1)
-            } else {
-                None
-            }
-        });
+        let _ = Panicking.map(Ok::<u8, ()>).filter_map_ok(|x| (x % 2 == 0).then_some(x + 1));
     }
     flatten_ok {
         let _ = Panicking.map(|x| Ok::<_, ()>([x])).flatten_ok();

tests/quick.rs

@@ -1874,7 +1874,7 @@ quickcheck! {
     fn fused_filter_map_ok(a: Iter<i16>) -> bool
     {
         is_fused(a.map(|x| if x % 2 == 0 {Ok(x)} else {Err(x)} )
-                 .filter_map_ok(|x| if x % 3 == 0 {Some(x / 3)} else {None})
+                 .filter_map_ok(|x| (x % 3 == 0).then_some(x / 3))
                  .fuse())
     }
 

tests/specializations.rs

@@ -229,7 +229,7 @@ quickcheck! {
     }
 
     fn while_some(v: Vec<u8>) -> () {
-        test_specializations(&v.iter().map(|&x| if x < 100 { Some(2 * x) } else { None }).while_some());
+        test_specializations(&v.iter().map(|&x| (x < 100).then_some(2 * x)).while_some());
     }
 
     fn pad_using(v: Vec<u8>) -> () {
@@ -460,7 +460,7 @@ quickcheck! {
     }
 
     fn filter_map_ok(v: Vec<Result<u8, char>>) -> () {
-        let it = v.into_iter().filter_map_ok(|i| if i < 20 { Some(i * 2) } else { None });
+        let it = v.into_iter().filter_map_ok(|i| (i < 20).then_some(i * 2));
         test_specializations(&it);
         test_double_ended_specializations(&it);
     }

tests/test_std.rs

@@ -1453,9 +1453,7 @@ fn format() {
 
 #[test]
 fn while_some() {
-    let ns = (1..10)
-        .map(|x| if x % 5 != 0 { Some(x) } else { None })
-        .while_some();
+    let ns = (1..10).map(|x| (x % 5 != 0).then_some(x)).while_some();
     it::assert_equal(ns, vec![1, 2, 3, 4]);
 }