Rollup merge of #157884 - GuillaumeGomez:rename-err-to-diag, r=JonathanBrouwer

Rename `errors.rs` file to `diagnostics.rs` (9/N)

Follow-up of #157485.

r? @JonathanBrouwer

Author: JonathanBrouwer

compiler/rustc_borrowck/src/diagnostics/opaque_types.rs

@@ -12,8 +12,8 @@ use rustc_middle::ty::{
     Unnormalized,
 };
 use rustc_span::Span;
+use rustc_trait_selection::diagnostics::impl_trait_overcapture_suggestion;
 use rustc_trait_selection::error_reporting::infer::region::unexpected_hidden_region_diagnostic;
-use rustc_trait_selection::errors::impl_trait_overcapture_suggestion;
 
 use crate::MirBorrowckCtxt;
 use crate::borrow_set::BorrowData;

compiler/rustc_lint/src/impl_trait_overcaptures.rs

@@ -23,7 +23,7 @@ use rustc_middle::{bug, span_bug};
 use rustc_session::lint::fcw;
 use rustc_session::{declare_lint, declare_lint_pass};
 use rustc_span::{Span, Symbol};
-use rustc_trait_selection::errors::{
+use rustc_trait_selection::diagnostics::{
     AddPreciseCapturingForOvercapture, impl_trait_overcapture_suggestion,
 };
 use rustc_trait_selection::regions::OutlivesEnvironmentBuildExt;

compiler/rustc_mir_transform/src/check_call_recursion.rs

@@ -10,7 +10,7 @@ use rustc_middle::ty::{self, GenericArg, GenericArgs, Instance, Ty, TyCtxt, Unno
 use rustc_session::lint::builtin::UNCONDITIONAL_RECURSION;
 use rustc_span::Span;
 
-use crate::errors::UnconditionalRecursion;
+use crate::diagnostics::UnconditionalRecursion;
 use crate::pass_manager::MirLint;
 
 pub(super) struct CheckCallRecursion;

compiler/rustc_mir_transform/src/check_const_item_mutation.rs

@@ -6,7 +6,7 @@ use rustc_session::lint::builtin::CONST_ITEM_MUTATION;
 use rustc_span::Span;
 use rustc_span::def_id::DefId;
 
-use crate::errors;
+use crate::diagnostics;
 
 pub(super) struct CheckConstItemMutation;
 
@@ -108,7 +108,7 @@ impl<'tcx> Visitor<'tcx> for ConstMutationChecker<'_, 'tcx> {
                     CONST_ITEM_MUTATION,
                     lint_root,
                     span,
-                    errors::ConstMutate::Modify { konst: item },
+                    diagnostics::ConstMutate::Modify { konst: item },
                 );
             }
 
@@ -154,7 +154,7 @@ impl<'tcx> Visitor<'tcx> for ConstMutationChecker<'_, 'tcx> {
                         CONST_ITEM_MUTATION,
                         lint_root,
                         span,
-                        errors::ConstMutate::MutBorrow { method_call, konst: item },
+                        diagnostics::ConstMutate::MutBorrow { method_call, konst: item },
                     );
                 }
             }

compiler/rustc_mir_transform/src/check_inline.rs

@@ -26,7 +26,7 @@ impl<'tcx> MirLint<'tcx> for CheckForceInline {
         if let Err(reason) =
             is_inline_valid_on_fn(tcx, def_id).and_then(|_| is_inline_valid_on_body(tcx, body))
         {
-            tcx.dcx().emit_err(crate::errors::InvalidForceInline {
+            tcx.dcx().emit_err(crate::diagnostics::InvalidForceInline {
                 attr_span,
                 callee_span: tcx.def_span(def_id),
                 callee: tcx.def_path_str(def_id),

compiler/rustc_mir_transform/src/check_packed_ref.rs

@@ -3,7 +3,7 @@ use rustc_middle::mir::*;
 use rustc_middle::span_bug;
 use rustc_middle::ty::{self, TyCtxt};
 
-use crate::{errors, util};
+use crate::{diagnostics, util};
 
 pub(super) struct CheckPackedRef;
 
@@ -50,7 +50,7 @@ impl<'tcx> Visitor<'tcx> for PackedRefChecker<'_, 'tcx> {
                 // shouldn't do.
                 span_bug!(self.source_info.span, "builtin derive created an unaligned reference");
             } else {
-                self.tcx.dcx().emit_err(errors::UnalignedPackedRef {
+                self.tcx.dcx().emit_err(diagnostics::UnalignedPackedRef {
                     span: self.source_info.span,
                     ty_descr: adt.descr(),
                     align: pack.bytes(),

compiler/rustc_mir_transform/src/coroutine/layout.rs

@@ -46,7 +46,7 @@ use rustc_trait_selection::infer::TyCtxtInferExt as _;
 use rustc_trait_selection::traits::{ObligationCause, ObligationCauseCode, ObligationCtxt};
 use tracing::{debug, instrument, trace};
 
-use crate::errors::{MustNotSupend, MustNotSuspendReason};
+use crate::diagnostics::{MustNotSupend, MustNotSuspendReason};
 
 const SELF_ARG: Local = Local::arg(0);
 

…mpiler/rustc_mir_transform/src/errors.rs …r/rustc_mir_transform/src/diagnostics.rscompiler/rustc_mir_transform/src/errors.rs renamed to compiler/rustc_mir_transform/src/diagnostics.rs compiler/rustc_mir_transform/src/errors.rs renamed to compiler/rustc_mir_transform/src/diagnostics.rs

@@ -9,7 +9,7 @@ use rustc_session::lint::builtin::FFI_UNWIND_CALLS;
 use rustc_target::spec::PanicStrategy;
 use tracing::debug;
 
-use crate::errors;
+use crate::diagnostics;
 
 // Check if the body of this def_id can possibly leak a foreign unwind into Rust code.
 fn has_ffi_unwind_calls(tcx: TyCtxt<'_>, local_def_id: LocalDefId) -> bool {
@@ -67,7 +67,7 @@ fn has_ffi_unwind_calls(tcx: TyCtxt<'_>, local_def_id: LocalDefId) -> bool {
                     FFI_UNWIND_CALLS,
                     lint_root,
                     span,
-                    errors::AsmUnwindCall { span },
+                    diagnostics::AsmUnwindCall { span },
                 );
 
                 tainted = true;
@@ -119,7 +119,7 @@ fn has_ffi_unwind_calls(tcx: TyCtxt<'_>, local_def_id: LocalDefId) -> bool {
                 FFI_UNWIND_CALLS,
                 lint_root,
                 span,
-                errors::FfiUnwindCall { span, foreign },
+                diagnostics::FfiUnwindCall { span, foreign },
             );
 
             tainted = true;

compiler/rustc_mir_transform/src/ffi_unwind_calls.rs

@@ -7,7 +7,7 @@ use rustc_middle::ty::{self, EarlyBinder, GenericArgsRef, Ty, TyCtxt};
 use rustc_session::lint::builtin::FUNCTION_ITEM_REFERENCES;
 use rustc_span::{Span, Spanned, sym};
 
-use crate::errors;
+use crate::diagnostics;
 
 pub(super) struct FunctionItemReferences;
 
@@ -179,7 +179,7 @@ impl<'tcx> FunctionItemRefChecker<'_, 'tcx> {
             FUNCTION_ITEM_REFERENCES,
             lint_root,
             span,
-            errors::FnItemRef { span, sugg, ident },
+            diagnostics::FnItemRef { span, sugg, ident },
         );
     }
 }