Rollup merge of #103915 - chenyukang:yukang/fix-103874, r=lcnr

Improve use of ErrorGuaranteed and code cleanup Part of #103874
2022-11-04 06:40:32 +01:00 · 2022-11-04 06:40:32 +01:00 · 61c6cdb5f4
commit 61c6cdb5f4
parent 47bf74302b c6d23bdd32
15 changed files with 30 additions and 51 deletions
--- a/compiler/rustc_hir_analysis/src/astconv/mod.rs
+++ b/compiler/rustc_hir_analysis/src/astconv/mod.rs
@ -1979,7 +1979,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                    }

                    err.emit()
-                } else if let Some(reported) = qself_ty.error_reported() {
+                } else if let Err(reported) = qself_ty.error_reported() {
                    reported
                } else {
                    // Don't print `TyErr` to the user.