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

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

Follow-up of #157485.

r? @JonathanBrouwer

Author: jhpratt

compiler/rustc_mir_build/src/builder/expr/into.rs

@@ -18,7 +18,7 @@ use crate::builder::expr::category::{Category, RvalueFunc};
 use crate::builder::matches::{DeclareLetBindings, Exhaustive, HasMatchGuard};
 use crate::builder::scope::LintLevel;
 use crate::builder::{BlockAnd, BlockAndExtension, BlockFrame, Builder, NeedsTemporary};
-use crate::errors::{LoopMatchArmWithGuard, LoopMatchUnsupportedType};
+use crate::diagnostics::{LoopMatchArmWithGuard, LoopMatchUnsupportedType};
 
 impl<'a, 'tcx> Builder<'a, 'tcx> {
     /// Compile `expr`, storing the result into `destination`, which

compiler/rustc_mir_build/src/builder/mod.rs

@@ -44,7 +44,7 @@ use rustc_span::{Span, Symbol};
 
 use crate::builder::expr::as_place::PlaceBuilder;
 use crate::builder::scope::{DropKind, LintLevel};
-use crate::errors;
+use crate::diagnostics;
 
 pub(crate) fn closure_saved_names_of_captured_variables<'tcx>(
     tcx: TyCtxt<'tcx>,
@@ -931,7 +931,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                 lint::builtin::UNREACHABLE_CODE,
                 lint_root,
                 target_loc.span,
-                errors::UnreachableDueToUninhabited {
+                diagnostics::UnreachableDueToUninhabited {
                     expr: target_loc.span,
                     orig: orig_span,
                     descr,

compiler/rustc_mir_build/src/builder/scope.rs

@@ -99,7 +99,7 @@ use tracing::{debug, instrument};
 
 use super::matches::BuiltMatchTree;
 use crate::builder::{BlockAnd, BlockAndExtension, BlockFrame, Builder, CFG};
-use crate::errors::{
+use crate::diagnostics::{
     ConstContinueBadConst, ConstContinueNotMonomorphicConst, ConstContinueUnknownJumpTarget,
 };
 
@@ -924,7 +924,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
             | ExprKind::NamedConst { .. } => self.as_constant(&self.thir[value]),
 
             other => {
-                use crate::errors::ConstContinueNotMonomorphicConstReason as Reason;
+                use crate::diagnostics::ConstContinueNotMonomorphicConstReason as Reason;
 
                 let span = expr.span;
                 let reason = match other {

compiler/rustc_mir_build/src/check_unsafety.rs

@@ -16,7 +16,7 @@ use rustc_session::lint::builtin::{DEPRECATED_SAFE_2024, UNSAFE_OP_IN_UNSAFE_FN,
 use rustc_span::def_id::{DefId, LocalDefId};
 use rustc_span::{Span, Symbol};
 
-use crate::errors::*;
+use crate::diagnostics::*;
 
 struct UnsafetyVisitor<'a, 'tcx> {
     tcx: TyCtxt<'tcx>,

compiler/rustc_mir_build/src/errors.rs …piler/rustc_mir_build/src/diagnostics.rscompiler/rustc_mir_build/src/errors.rs renamed to compiler/rustc_mir_build/src/diagnostics.rs compiler/rustc_mir_build/src/errors.rs renamed to compiler/rustc_mir_build/src/diagnostics.rs

@@ -11,7 +11,7 @@
 mod builder;
 mod check_tail_calls;
 mod check_unsafety;
-mod errors;
+mod diagnostics;
 pub mod thir;
 
 use rustc_middle::util::Providers;

compiler/rustc_mir_build/src/lib.rs

@@ -22,7 +22,7 @@ use rustc_middle::{bug, span_bug};
 use rustc_span::Span;
 use tracing::{debug, info, instrument, trace};
 
-use crate::errors::*;
+use crate::diagnostics::*;
 use crate::thir::cx::ThirBuildCx;
 
 impl<'tcx> ThirBuildCx<'tcx> {

compiler/rustc_mir_build/src/thir/cx/expr.rs

@@ -27,7 +27,7 @@ use rustc_span::{Ident, Span};
 use rustc_trait_selection::infer::InferCtxtExt;
 use tracing::instrument;
 
-use crate::errors::*;
+use crate::diagnostics::*;
 
 pub(crate) fn check_match(tcx: TyCtxt<'_>, def_id: LocalDefId) -> Result<(), ErrorGuaranteed> {
     let typeck_results = tcx.typeck(def_id);

compiler/rustc_mir_build/src/thir/pattern/check_match.rs

@@ -20,7 +20,7 @@ use rustc_trait_selection::traits::query::evaluate_obligation::InferCtxtExt;
 use tracing::{debug, instrument, trace};
 
 use super::PatCtxt;
-use crate::errors::{
+use crate::diagnostics::{
     ConstPatternDependsOnGenericParameter, CouldNotEvalConstPattern, InvalidPattern, NaNPattern,
     PointerPattern, SuggestEq, TypeNotPartialEq, TypeNotStructural, UnionPattern, UnsizedPattern,
 };

compiler/rustc_mir_build/src/thir/pattern/const_to_pat.rs

@@ -29,7 +29,7 @@ use tracing::{debug, instrument};
 
 pub(crate) use self::check_match::check_match;
 use self::migration::PatMigration;
-use crate::errors::*;
+use crate::diagnostics::*;
 use crate::thir::cx::ThirBuildCx;
 
 /// Context for lowering HIR patterns to THIR patterns.