cover most edge cases

Author: lolbinarycat

tests/ui/and_then_then_some.rs

@@ -3,10 +3,10 @@
 fn main() {
 	let x = Some("foo".to_string());
 
-    /*let _y = x.clone().and_then(|v| v.starts_with('f')
+    let _y = x.clone().and_then(|v| v.starts_with('f')
         .then_some(v));
 
-	let _z = x.clone().and_then(|v| bool::then_some(v.starts_with('f'), v));*/
+	let _z = x.clone().and_then(|v| bool::then_some(v.starts_with('f'), v));
 	let _w = Option::and_then(x, |v| {
 		bool::then_some(v.starts_with('f'), v)
 	});