Refactor away `fn must_be_known_in_context`

1 files changed, 7 insertions, 11 deletions

diff --git a/src/librustc_typeck/check/mod.rs b/src/librustc_typeck/check/mod.rs
index b1645ed9228..0395b3eb4aa 100644
--- a/src/librustc_typeck/check/mod.rs
+++ b/src/librustc_typeck/check/mod.rs
@@ -4940,18 +4940,14 @@ impl<'a, 'gcx, 'tcx> FnCtxt<'a, 'gcx, 'tcx> {
         if !ty.is_ty_var() {
             ty
         } else {
-            self.must_be_known_in_context(sp, ty)
-        }
-    }
-
-    fn must_be_known_in_context(&self, sp: Span, ty: Ty<'tcx>) -> Ty<'tcx> {
-        if !self.is_tainted_by_errors() {
-            type_error_struct!(self.tcx.sess, sp, ty, E0619,
-                                "the type of this value must be known in this context")
-            .emit();
+            if !self.is_tainted_by_errors() {
+                type_error_struct!(self.tcx.sess, sp, ty, E0619,
+                                    "the type of this value must be known in this context")
+                .emit();
+            }
+            self.demand_suptype(sp, self.tcx.types.err, ty);
+            self.tcx.types.err
         }
-        self.demand_suptype(sp, self.tcx.types.err, ty);
-        self.tcx.types.err
     }
 
     fn with_breakable_ctxt<F: FnOnce() -> R, R>(&self, id: ast::NodeId,