fix tests

Author: jdonszelmann

compiler/rustc_hir_typeck/src/check.rs

@@ -1,7 +1,6 @@
 use std::cell::RefCell;
 
 use rustc_abi::ExternAbi;
-use rustc_hir::def::DefKind;
 use rustc_hir as hir;
 use rustc_hir::intravisit::Visitor;
 use rustc_hir::lang_items::LangItem;

compiler/rustc_metadata/src/rmeta/decoder.rs

@@ -782,10 +782,9 @@ impl MetadataBlob {
                     )?;
                     writeln!(
                         out,
-                        "has_global_allocator {} has_alloc_error_handler {} has_panic_handler {} has_default_lib_allocator {}",
+                        "has_global_allocator {} has_alloc_error_handler {} has_default_lib_allocator {}",
                         root.has_global_allocator,
                         root.has_alloc_error_handler,
-                        root.has_panic_handler,
                         root.has_default_lib_allocator
                     )?;
                     writeln!(

compiler/rustc_metadata/src/rmeta/decoder/cstore_impl.rs

@@ -348,7 +348,6 @@ provide! { tcx, def_id, other, cdata,
     is_compiler_builtins => { cdata.root.compiler_builtins }
     has_global_allocator => { cdata.root.has_global_allocator }
     has_alloc_error_handler => { cdata.root.has_alloc_error_handler }
-    has_panic_handler => { cdata.root.has_panic_handler }
     is_profiler_runtime => { cdata.root.profiler_runtime }
     required_panic_strategy => { cdata.root.required_panic_strategy }
     panic_in_drop_strategy => { cdata.root.panic_in_drop_strategy }

compiler/rustc_metadata/src/rmeta/encoder.rs

@@ -713,7 +713,6 @@ impl<'a, 'tcx> EncodeContext<'a, 'tcx> {
                 edition: tcx.sess.edition(),
                 has_global_allocator: tcx.has_global_allocator(LOCAL_CRATE),
                 has_alloc_error_handler: tcx.has_alloc_error_handler(LOCAL_CRATE),
-                has_panic_handler: tcx.has_panic_handler(LOCAL_CRATE),
                 externally_implementable_items,
 
                 has_default_lib_allocator: ast::attr::contains_name(

compiler/rustc_metadata/src/rmeta/mod.rs

@@ -261,7 +261,6 @@ pub(crate) struct CrateRoot {
     // TODO: these booleans can be replaced by the entries in `externally_implementable_items`
     has_global_allocator: bool,
     has_alloc_error_handler: bool,
-    has_panic_handler: bool,
     has_default_lib_allocator: bool,
     externally_implementable_items: LazyArray<(DefId, (EIIDecl, Vec<(DefId, EIIImpl)>))>,
 

compiler/rustc_middle/src/hir/map.rs

@@ -1030,9 +1030,9 @@ impl<'tcx> TyCtxt<'tcx> {
             Node::PreciseCapturingNonLifetimeArg(param) => param.ident.span,
             Node::Synthetic => {
                 if let Some(EiiMapping { chosen_impl, .. }) =
-                    self.tcx.get_externally_implementable_item_impls(()).get(&hir_id.owner.def_id)
+                    self.get_externally_implementable_item_impls(()).get(&hir_id.owner.def_id)
                 {
-                    self.tcx.def_span(chosen_impl)
+                    self.def_span(chosen_impl)
                 } else {
                     unreachable!()
                 }

compiler/rustc_middle/src/hir/mod.rs

@@ -227,7 +227,7 @@ pub fn provide(providers: &mut Providers) {
         } else if let Some(EiiMapping { chosen_impl, .. }) =
             tcx.get_externally_implementable_item_impls(()).get(&def_id)
         {
-            tcx.fn_arg_names(chosen_impl)
+            tcx.fn_arg_idents(chosen_impl)
         } else {
             span_bug!(
                 tcx.hir_span(tcx.local_def_id_to_hir_id(def_id)),

compiler/rustc_passes/src/errors.rs

@@ -862,10 +862,6 @@ pub(crate) struct UnknownExternLangItem {
     pub lang_item: Symbol,
 }
 
-#[derive(Diagnostic)]
-#[diag(passes_missing_panic_handler)]
-pub(crate) struct MissingPanicHandler;
-
 #[derive(Diagnostic)]
 #[diag(passes_panic_unwind_without_std)]
 #[help]

compiler/rustc_passes/src/weak_lang_items.rs

@@ -9,9 +9,7 @@ use rustc_middle::middle::lang_items::required;
 use rustc_middle::ty::TyCtxt;
 use rustc_session::config::CrateType;
 
-use crate::errors::{
-    MissingLangItem, MissingPanicHandler, PanicUnwindWithoutStd, UnknownExternLangItem,
-};
+use crate::errors::{MissingLangItem, PanicUnwindWithoutStd, UnknownExternLangItem};
 
 /// Checks the crate for usage of weak lang items, returning a vector of all the
 /// lang items required by this crate, but not defined yet.
@@ -83,9 +81,7 @@ fn verify(tcx: TyCtxt<'_>, items: &lang_items::LanguageItems) {
 
     for &item in WEAK_LANG_ITEMS.iter() {
         if missing.contains(&item) && required(tcx, item) && items.get(item).is_none() {
-            if item == LangItem::PanicImpl {
-                tcx.dcx().emit_err(MissingPanicHandler);
-            } else if item == LangItem::EhPersonality {
+            if item == LangItem::EhPersonality {
                 tcx.dcx().emit_err(PanicUnwindWithoutStd);
             } else {
                 tcx.dcx().emit_err(MissingLangItem { name: item.name() });

compiler/rustc_resolve/src/check_unused.rs

@@ -402,7 +402,6 @@ impl Resolver<'_, '_> {
                         !tcx.is_compiler_builtins(cnum)
                             && !tcx.is_panic_runtime(cnum)
                             && !tcx.has_global_allocator(cnum)
-                            && !tcx.has_panic_handler(cnum)
                     }) {
                         maybe_unused_extern_crates.insert(id, import.span);
                     }