---

yaml
---
r: 273925
b: refs/heads/beta
c: 1ea98a8
h: refs/heads/master
i:
  273923: 9e46496

Author: jonas-schievink

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 580c5f92d1050543f5e69f842ef8c4899ab2540e
+refs/heads/beta: 1ea98a8b7060579e69c6269cdfb1cc527093d561
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/librustc_typeck/check/method/suggest.rs

@@ -74,14 +74,14 @@ fn is_fn_ty<'a, 'tcx>(ty: &Ty<'tcx>, fcx: &FnCtxt<'a, 'tcx>, span: Span) -> bool
                         let mut selcx = SelectionContext::new(infcx);
 
                         if selcx.evaluate_obligation(&obligation) {
-                            Some(true)
+                            Some(())
                         } else {
                             None
                         }
                     })
                 });
 
-                opt_is_fn.unwrap_or(false)
+                opt_is_fn.is_some()
             } else {
                 false
             }