Rollup merge of #104359 - Nilstrieb:plus-one, r=fee1-dead

[rust.git] / compiler / rustc_hir_typeck / src / writeback.rs

diff --git a/compiler/rustc_hir_typeck/src/writeback.rs b/compiler/rustc_hir_typeck/src/writeback.rs
index a620a05aca202214e710a6dbb601ce246c34638b..6c2ee35fa50da5b1daef213e9941db8fc3510113 100644 (file)
--- a/compiler/rustc_hir_typeck/src/writeback.rs
+++ b/compiler/rustc_hir_typeck/src/writeback.rs
@@ -83,7 +83,7 @@ pub fn resolve_type_vars_in_body(
         wbcx.typeck_results.treat_byte_string_as_slice =
             mem::take(&mut self.typeck_results.borrow_mut().treat_byte_string_as_slice);
 
-        if let Some(e) = self.is_tainted_by_errors() {
+        if let Some(e) = self.tainted_by_errors() {
             wbcx.typeck_results.tainted_by_errors = Some(e);
         }
 
@@ -673,7 +673,6 @@ fn resolve<T>(&mut self, x: T, span: &dyn Locatable) -> T
         // to mark the `TypeckResults` as tainted in that case, so that downstream
         // users of the typeck results don't produce extra errors, or worse, ICEs.
         if let Some(e) = resolver.replaced_with_error {
-            // FIXME(eddyb) keep track of `ErrorGuaranteed` from where the error was emitted.
             self.typeck_results.tainted_by_errors = Some(e);
         }