Allow explicit returns with cfg attributes

diff --git a/clippy_lints/src/returns.rs b/clippy_lints/src/returns.rs
index 0e6de0d39b22201c663baaec4287006530cb802b..334e7142cff27411be3590e9f4dcc7ec4989312a 100644 (file)
--- a/clippy_lints/src/returns.rs
+++ b/clippy_lints/src/returns.rs
@@ -58,10 +58,21 @@ fn check_block_return(&mut self, cx: &EarlyContext, block: &ast::Block) {
 
     // Check a the final expression in a block if it's a return.
     fn check_final_expr(&mut self, cx: &EarlyContext, expr: &ast::Expr, span: Option<Span>) {
+        fn attr_is_cfg(attr: &ast::Attribute) -> bool {
+            if let ast::MetaItemKind::List(ref key, _) = attr.node.value.node {
+                *key == "cfg"
+            } else {
+                false
+            }
+        }
+
         match expr.node {
             // simple return is always "bad"
             ast::ExprKind::Ret(Some(ref inner)) => {
-                self.emit_return_lint(cx, span.expect("`else return` is not possible"), inner.span);
+                // allow `#[cfg(a)] return a; #[cfg(b)] return b;`
+                if !expr.attrs.iter().any(attr_is_cfg) {
+                    self.emit_return_lint(cx, span.expect("`else return` is not possible"), inner.span);
+                }
             }
             // a whole block? check it!
             ast::ExprKind::Block(ref block) => {

diff --git a/tests/run-pass/needless_return.rs b/tests/run-pass/needless_return.rs
new file mode 100644 (file)
index 0000000..5a0225f
--- /dev/null
+++ b/tests/run-pass/needless_return.rs
@@ -0,0 +1,9 @@
+#[deny(warnings)]
+fn cfg_return() -> i32 {
+    #[cfg(msvc)] return 1;
+    #[cfg(not(msvc))] return 2;
+}
+
+fn main() {
+    cfg_return();
+}