From 5bb0a03fa77e3f08724e9a4745703a1774f43921 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Esteban=20K=C3=BCber?= <esteban@kuber.com.ar>
Date: Thu, 10 Oct 2019 19:34:56 -0700
Subject: [PATCH] Move diagnostics code out of the critical path

---
 src/librustc_typeck/check/method/mod.rs | 37 +++++++++++++------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/src/librustc_typeck/check/method/mod.rs b/src/librustc_typeck/check/method/mod.rs
index 434ead50e0423..e57cc809c3479 100644
--- a/src/librustc_typeck/check/method/mod.rs
+++ b/src/librustc_typeck/check/method/mod.rs
@@ -213,27 +213,28 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
             segment,
         );
 
-        let mut needs_mut = false;
-        if let ty::Ref(region, t_type, mutability) = self_ty.kind {
-            let trait_type = self.tcx.mk_ref(region, ty::TypeAndMut {
-                ty: t_type,
-                mutbl: mutability.invert(),
-            });
-            match self.lookup_probe(
-                span,
-                segment.ident,
-                trait_type,
-                call_expr,
-                ProbeScope::TraitsInScope
-            ) {
-                Ok(ref new_pick) if *new_pick != pick => {
-                    needs_mut = true;
+        if result.illegal_sized_bound {
+            let mut needs_mut = false;
+            if let ty::Ref(region, t_type, mutability) = self_ty.kind {
+                let trait_type = self.tcx.mk_ref(region, ty::TypeAndMut {
+                    ty: t_type,
+                    mutbl: mutability.invert(),
+                });
+                // We probe again to see if there might be a borrow mutability discrepancy.
+                match self.lookup_probe(
+                    span,
+                    segment.ident,
+                    trait_type,
+                    call_expr,
+                    ProbeScope::TraitsInScope
+                ) {
+                    Ok(ref new_pick) if *new_pick != pick => {
+                        needs_mut = true;
+                    }
+                    _ => {}
                 }
-                _ => {}
             }
-        }
 
-        if result.illegal_sized_bound {
             // We probe again, taking all traits into account (not only those in scope).
             let candidates = match self.lookup_probe(
                 span,