Merge pull request #919 from oli-obk/fix/917

don't suggest closures over constants

src/methods.rs

@@ -1,6 +1,7 @@
 use rustc::hir::*;
 use rustc::lint::*;
 use rustc::middle::const_val::ConstVal;
+use rustc::middle::const_qualif::ConstQualif;
 use rustc::ty::subst::{Subst, TypeSpace};
 use rustc::ty;
 use rustc_const_eval::EvalHint::ExprTypeChecked;
@@ -502,6 +503,13 @@ fn lint_or_fun_call(cx: &LateContext, expr: &Expr, name: &str, args: &[P<Expr>])
     /// Check for `*or(foo())`.
     fn check_general_case(cx: &LateContext, name: &str, fun: &Expr, self_expr: &Expr, arg: &Expr, or_has_args: bool,
                           span: Span) {
+        // don't lint for constant values
+        // FIXME: can we `expect` here instead of match?
+        if let Some(qualif) = cx.tcx.const_qualif_map.borrow().get(&arg.id) {
+            if !qualif.contains(ConstQualif::NOT_CONST) {
+                return;
+            }
+        }
         // (path, fn_has_argument, methods)
         let know_types: &[(&[_], _, &[_], _)] = &[(&paths::BTREEMAP_ENTRY, false, &["or_insert"], "with"),
                                                   (&paths::HASHMAP_ENTRY, false, &["or_insert"], "with"),

tests/compile-fail/methods.rs

@@ -1,4 +1,5 @@
 #![feature(plugin)]
+#![feature(const_fn)]
 #![plugin(clippy)]
 
 #![deny(clippy, clippy_pedantic)]
@@ -227,8 +228,20 @@ fn or_fun_call() {
         fn new() -> Foo { Foo }
     }
 
+    enum Enum {
+        A(i32),
+    }
+
+    const fn make_const(i: i32) -> i32 { i }
+
     fn make<T>() -> T { unimplemented!(); }
 
+    let with_enum = Some(Enum::A(1));
+    with_enum.unwrap_or(Enum::A(5));
+
+    let with_const_fn = Some(1);
+    with_const_fn.unwrap_or(make_const(5));
+
     let with_constructor = Some(vec![1]);
     with_constructor.unwrap_or(make());
     //~^ERROR use of `unwrap_or`