Rollup of 17 pull requests

compiler/rustc_codegen_cranelift/src/abi/mod.rs

@@ -14,7 +14,7 @@ use cranelift_codegen::isa::CallConv;
 use cranelift_module::ModuleError;
 use rustc_abi::{CanonAbi, ExternAbi, X86Call};
 use rustc_codegen_ssa::base::is_call_from_compiler_builtins_to_upstream_monomorphization;
-use rustc_codegen_ssa::errors::CompilerBuiltinsCannotCall;
+use rustc_codegen_ssa::diagnostics::CompilerBuiltinsCannotCall;
 use rustc_middle::middle::codegen_fn_attrs::CodegenFnAttrFlags;
 use rustc_middle::ty::layout::FnAbiOf;
 use rustc_middle::ty::print::with_no_trimmed_paths;

compiler/rustc_codegen_gcc/src/context.rs

@@ -4,7 +4,7 @@ use std::collections::HashMap;
 use gccjit::{Block, CType, Context, Function, FunctionType, LValue, Location, RValue, Type};
 use rustc_abi::{Align, HasDataLayout, PointeeInfo, Size, TargetDataLayout, VariantIdx};
 use rustc_codegen_ssa::base::wants_msvc_seh;
-use rustc_codegen_ssa::errors as ssa_errors;
+use rustc_codegen_ssa::diagnostics as ssa_errors;
 use rustc_codegen_ssa::traits::{BackendTypes, BaseTypeCodegenMethods, MiscCodegenMethods};
 use rustc_data_structures::base_n::{ALPHANUMERIC_ONLY, ToBaseN};
 use rustc_data_structures::fx::{FxHashMap, FxHashSet};

compiler/rustc_codegen_gcc/src/intrinsic/mod.rs

@@ -8,7 +8,7 @@ use gccjit::{ComparisonOp, Function, FunctionType, RValue, ToRValue, Type, Unary
 use rustc_abi::{Align, BackendRepr, HasDataLayout, WrappingRange};
 use rustc_codegen_ssa::base::wants_msvc_seh;
 use rustc_codegen_ssa::common::IntPredicate;
-use rustc_codegen_ssa::errors::InvalidMonomorphization;
+use rustc_codegen_ssa::diagnostics::InvalidMonomorphization;
 use rustc_codegen_ssa::mir::IntrinsicResult;
 use rustc_codegen_ssa::mir::operand::{OperandRef, OperandValue};
 use rustc_codegen_ssa::mir::place::{PlaceRef, PlaceValue};

compiler/rustc_codegen_gcc/src/intrinsic/simd.rs

@@ -7,8 +7,8 @@ use rustc_abi::{Align, Size};
 use rustc_codegen_ssa::base::compare_simd_types;
 use rustc_codegen_ssa::common::{IntPredicate, TypeKind};
 #[cfg(feature = "master")]
-use rustc_codegen_ssa::errors::ExpectedPointerMutability;
-use rustc_codegen_ssa::errors::InvalidMonomorphization;
+use rustc_codegen_ssa::diagnostics::ExpectedPointerMutability;
+use rustc_codegen_ssa::diagnostics::InvalidMonomorphization;
 use rustc_codegen_ssa::mir::operand::OperandRef;
 use rustc_codegen_ssa::mir::place::PlaceRef;
 use rustc_codegen_ssa::traits::{BaseTypeCodegenMethods, BuilderMethods};

compiler/rustc_codegen_llvm/src/context.rs

@@ -8,7 +8,7 @@ use std::str;
 use rustc_abi::{HasDataLayout, Size, TargetDataLayout, VariantIdx};
 use rustc_codegen_ssa::back::versioned_llvm_target;
 use rustc_codegen_ssa::base::{wants_msvc_seh, wants_wasm_eh};
-use rustc_codegen_ssa::errors as ssa_errors;
+use rustc_codegen_ssa::diagnostics as ssa_errors;
 use rustc_codegen_ssa::traits::*;
 use rustc_data_structures::base_n::{ALPHANUMERIC_ONLY, ToBaseN};
 use rustc_data_structures::fx::FxHashMap;

compiler/rustc_codegen_llvm/src/intrinsic.rs

@@ -9,7 +9,7 @@ use rustc_abi::{
 use rustc_codegen_ssa::RetagInfo;
 use rustc_codegen_ssa::base::{compare_simd_types, wants_msvc_seh, wants_wasm_eh};
 use rustc_codegen_ssa::common::{IntPredicate, TypeKind};
-use rustc_codegen_ssa::errors::{ExpectedPointerMutability, InvalidMonomorphization};
+use rustc_codegen_ssa::diagnostics::{ExpectedPointerMutability, InvalidMonomorphization};
 use rustc_codegen_ssa::mir::IntrinsicResult;
 use rustc_codegen_ssa::mir::operand::{OperandRef, OperandValue};
 use rustc_codegen_ssa::mir::place::{PlaceRef, PlaceValue};

compiler/rustc_codegen_ssa/src/assert_module_sources.rs

@@ -37,7 +37,7 @@ use rustc_session::Session;
 use rustc_span::{Span, Symbol};
 use tracing::debug;
 
-use crate::errors;
+use crate::diagnostics;
 
 #[allow(missing_docs)]
 pub fn assert_module_sources(tcx: TyCtxt<'_>, set_reuse: &dyn Fn(&mut CguReuseTracker)) {
@@ -107,7 +107,7 @@ impl<'tcx> AssertModuleSource<'tcx> {
             | CguFields::PartitionReused { cfg, module }) = cgu_fields;
 
             if !self.tcx.sess.opts.unstable_opts.query_dep_graph {
-                self.tcx.dcx().emit_fatal(errors::MissingQueryDepGraph { span });
+                self.tcx.dcx().emit_fatal(diagnostics::MissingQueryDepGraph { span });
             }
 
             if !self.check_config(cfg) {
@@ -120,7 +120,11 @@ impl<'tcx> AssertModuleSource<'tcx> {
             let crate_name = crate_name.as_str();
 
             if !user_path.starts_with(&crate_name) {
-                self.tcx.dcx().emit_fatal(errors::MalformedCguName { span, user_path, crate_name });
+                self.tcx.dcx().emit_fatal(diagnostics::MalformedCguName {
+                    span,
+                    user_path,
+                    crate_name,
+                });
             }
 
             // Split of the "special suffix" if there is one.
@@ -149,7 +153,7 @@ impl<'tcx> AssertModuleSource<'tcx> {
             if !self.available_cgus.contains(&cgu_name) {
                 let cgu_names: Vec<&str> =
                     self.available_cgus.items().map(|cgu| cgu.as_str()).into_sorted_stable_ord();
-                self.tcx.dcx().emit_err(errors::NoModuleNamed {
+                self.tcx.dcx().emit_err(diagnostics::NoModuleNamed {
                     span,
                     user_path,
                     cgu_name,
@@ -273,7 +277,7 @@ impl CguReuseTracker {
 
                     if error {
                         let at_least = if at_least { 1 } else { 0 };
-                        sess.dcx().emit_err(errors::IncorrectCguReuseType {
+                        sess.dcx().emit_err(diagnostics::IncorrectCguReuseType {
                             span: *error_span,
                             cgu_user_name,
                             actual_reuse,
@@ -282,7 +286,7 @@ impl CguReuseTracker {
                         });
                     }
                 } else {
-                    sess.dcx().emit_fatal(errors::CguNotRecorded { cgu_user_name, cgu_name });
+                    sess.dcx().emit_fatal(diagnostics::CguNotRecorded { cgu_user_name, cgu_name });
                 }
             }
         }

compiler/rustc_codegen_ssa/src/back/apple.rs

@@ -10,7 +10,7 @@ pub(super) use rustc_target::spec::apple::OSVersion;
 use rustc_target::spec::{Arch, Env, Os, Target};
 use tracing::debug;
 
-use crate::errors::{XcrunError, XcrunSdkPathWarning};
+use crate::diagnostics::{XcrunError, XcrunSdkPathWarning};
 
 #[cfg(test)]
 mod tests;

compiler/rustc_codegen_ssa/src/back/archive.rs

@@ -26,8 +26,8 @@ use super::rmeta_link::{self, RmetaLinkCache};
 use super::symbol_edit::{apply_edits, collect_internal_names};
 use crate::common;
 // Public for ArchiveBuilderBuilder::extract_bundled_libs
-pub use crate::errors::ExtractBundledLibsError;
-use crate::errors::{
+pub use crate::diagnostics::ExtractBundledLibsError;
+use crate::diagnostics::{
     ArchiveBuildFailure, DlltoolFailImportLibrary, ErrorCallingDllTool, ErrorCreatingImportLibrary,
     ErrorWritingDEFFile, UnknownArchiveKind,
 };
@@ -502,7 +502,7 @@ impl<'a> ArchiveBuilder for ArArchiveBuilder<'a> {
         {
             let actual_kind = archive.kind();
             if !archive_kinds_compatible(actual_kind, expected_kind) {
-                self.sess.dcx().emit_warn(crate::errors::IncompatibleArchiveFormat {
+                self.sess.dcx().emit_warn(crate::diagnostics::IncompatibleArchiveFormat {
                     path: archive_path.clone(),
                     actual: archive_kind_display_name(actual_kind),
                     expected: archive_kind_display_name(expected_kind),