code clean up and remove crash test

Author: chenyukang

compiler/rustc_hir_analysis/src/collect.rs

@@ -1092,7 +1092,7 @@ fn lower_variant(
         })
         .collect();
     let recovered = match def {
-        hir::VariantData::Struct { recovered: Recovered::Yes(guard), .. } => Some(guard).copied(),
+        hir::VariantData::Struct { recovered: Recovered::Yes(guard), .. } => Some(*guard),
         _ => None,
     };
     ty::VariantDef::new(

compiler/rustc_hir_typeck/src/expr.rs

@@ -2177,7 +2177,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         skip_fields: &[hir::ExprField<'_>],
         kind_name: &str,
     ) -> ErrorGuaranteed {
-        if let Some(guaranteed) = variant.has_errors() {
+        if let Err(guaranteed) = variant.has_errors() {
             return guaranteed;
         }
         let mut err = self.err_ctxt().type_error_struct_with_diag(
@@ -2550,7 +2550,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 && !def.is_enum()
             {
                 let variant = def.non_enum_variant();
-                if let Some(taint) = variant.has_errors() {
+                if let Err(taint) = variant.has_errors() {
                     return taint;
                 }
             }

compiler/rustc_hir_typeck/src/pat.rs

@@ -1534,9 +1534,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
         let inexistent_fields_err = if !inexistent_fields.is_empty()
             && !inexistent_fields.iter().any(|field| field.ident.name == kw::Underscore)
         {
-            if let Some(guard) = variant.has_errors() {
-                return Err(guard);
-            }
+            variant.has_errors()?;
             Some(self.error_inexistent_fields(
                 adt.variant_descr(),
                 &inexistent_fields,
@@ -1815,9 +1813,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
                 return Ok(());
             }
 
-            if let Some(guaranteed) = variant.has_errors() {
-                return Err(guaranteed);
-            }
+            variant.has_errors()?;
 
             let path = rustc_hir_pretty::qpath_to_string(&self.tcx, qpath);
             let mut err = struct_span_code_err!(

compiler/rustc_middle/src/ty/mod.rs

@@ -1259,8 +1259,8 @@ impl VariantDef {
     }
 
     /// Was this variant obtained as part of recovering from a syntactic error?
-    pub fn has_errors(&self) -> Option<ErrorGuaranteed> {
-        self.tainted
+    pub fn has_errors(&self) -> Result<(), ErrorGuaranteed> {
+        self.tainted.map_or(Ok(()), Err)
     }
 
     #[inline]