question_mark: Lint only early returns

Author: sinkuu

clippy_lints/src/question_mark.rs

@@ -146,8 +146,7 @@ impl Pass {
             }
         }
 
-        // Check if the block has an implicit return expression
-        if let Some(ref ret_expr) = block.expr {
+        if let Some(ExprKind::Ret(Some(ret_expr))) = block.expr.as_ref().map(|e| &e.node) {
             return Some(ret_expr.clone());
         }
 

tests/ui/question_mark.rs

@@ -58,6 +58,12 @@ impl SomeStruct {
     		self.opt
         };
 
+        let _ = if self.opt.is_none() {
+			None
+		} else {
+    		self.opt
+        };
+
         let _ = if self.opt.is_none() {
 			return None;
 		} else {