Rollup of 8 pull requests

compiler/rustc_borrowck/src/type_check/mod.rs

@@ -24,7 +24,6 @@ use rustc_middle::mir::*;
 use rustc_middle::traits::query::NoSolution;
 use rustc_middle::ty::adjustment::PointerCoercion;
 use rustc_middle::ty::cast::CastTy;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::{
     self, CanonicalUserTypeAnnotation, CanonicalUserTypeAnnotations, GenericArgsRef, Ty, TyCtxt,
     TypeVisitableExt, UserArgs, UserTypeAnnotationIndex, fold_regions,

compiler/rustc_builtin_macros/src/deriving/default.rs

@@ -69,7 +69,15 @@ fn default_struct_substructure(
     variant_data: &VariantData,
     type_ident: Ident,
 ) -> BlockOrExpr {
+    // FIXME: This is currently needed to avoid a regression with attribute macros after
+    // derives that incorrectly rely on the generated code using `Unit {}` instead of `Unit`.
+    // See https://github.com/rust-lang/rust/issues/164078.
+    if variant_data.fields().is_empty() {
+        return BlockOrExpr::new_expr(cx.expr_struct_ident(trait_span, type_ident, ThinVec::new()));
+    }
+
     let expr = match variant_data {
+        // This is currently unreachable due to the above hack.
         VariantData::Unit(_) => cx.expr_ident(trait_span, type_ident),
         VariantData::Tuple(fields, _) => {
             let exprs = fields

compiler/rustc_codegen_cranelift/src/base.rs

@@ -12,7 +12,6 @@ use rustc_errors::DiagCtxtHandle;
 use rustc_index::IndexVec;
 use rustc_middle::ty::TypeVisitableExt;
 use rustc_middle::ty::adjustment::PointerCoercion;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::{FnAbiOf, HasTypingEnv as _};
 use rustc_middle::ty::print::with_no_trimmed_paths;
 use rustc_session::config::OutputFilenames;

compiler/rustc_codegen_cranelift/src/debuginfo/types.rs

@@ -3,7 +3,6 @@
 use gimli::write::{AttributeValue, UnitEntryId};
 use rustc_codegen_ssa::debuginfo::type_names;
 use rustc_data_structures::fx::FxHashMap;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::LayoutOf;
 use rustc_middle::ty::{self, Ty, TyCtxt};
 

compiler/rustc_codegen_cranelift/src/intrinsics/simd.rs

@@ -3,7 +3,6 @@
 use cranelift_codegen::ir::immediates::Offset32;
 use rustc_abi::Endian;
 use rustc_middle::ty::SimdAlign;
-use rustc_middle::ty::consts::ConstExt;
 
 use super::*;
 use crate::prelude::*;

compiler/rustc_codegen_cranelift/src/unsize.rs

@@ -3,7 +3,6 @@
 //! [`PointerCoercion::Unsize`]: `rustc_middle::ty::adjustment::PointerCoercion::Unsize`
 
 use rustc_codegen_ssa::base::validate_trivial_unsize;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::HasTypingEnv;
 use rustc_middle::ty::print::{with_no_trimmed_paths, with_no_visible_paths};
 

compiler/rustc_codegen_gcc/src/intrinsic/simd.rs

@@ -15,7 +15,6 @@ use rustc_codegen_ssa::traits::{BaseTypeCodegenMethods, BuilderMethods, LayoutTy
 #[cfg(feature = "master")]
 use rustc_hir as hir;
 use rustc_middle::mir::BinOp;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::{HasTyCtxt, HasTypingEnv as _, LayoutOf};
 use rustc_middle::ty::{self, Ty};
 use rustc_span::{ErrorGuaranteed, Span, Symbol, span_bug, sym};

compiler/rustc_codegen_llvm/src/back/write.rs

@@ -2,7 +2,7 @@ use std::ffi::{CStr, CString};
 use std::io::{self, Write};
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
-use std::{fs, slice, str};
+use std::{fs, ptr, slice, str};
 
 use libc::{c_char, c_int, c_void, size_t};
 use rustc_codegen_ssa::back::link::ensure_removed;
@@ -319,10 +319,22 @@ pub(crate) enum CodegenDiagnosticsStage {
     Codegen,
 }
 
+/// Context data that is passed to [`diagnostic_handler_callback`].
+#[derive(Clone, Copy)]
+struct DiagnosticHandlerCallbackData<'a> {
+    cgcx: &'a CodegenContext,
+    shared_emitter: &'a SharedEmitter,
+}
+
 pub(crate) struct DiagnosticHandlers<'a> {
-    data: *mut (&'a CodegenContext, &'a SharedEmitter),
     llcx: &'a llvm::Context,
-    old_handler: Option<&'a llvm::DiagnosticHandler>,
+    old_handler: Option<ptr::NonNull<llvm::DiagnosticHandler>>,
+
+    /// Ownership of the box-allocated data that was installed (as a pointer)
+    /// alongside [`diagnostic_handler_callback`].
+    ///
+    /// To be freed via [`Box::from_raw`] after the handler is removed.
+    diagnostic_handler_callback_data: *mut DiagnosticHandlerCallbackData<'a>,
 }
 
 impl<'a> DiagnosticHandlers<'a> {
@@ -363,13 +375,14 @@ impl<'a> DiagnosticHandlers<'a> {
             .and_then(|dir| dir.to_str().and_then(|p| CString::new(p).ok()));
 
         let pgo_available = cgcx.module_config.pgo_use.is_some();
-        let data = Box::into_raw(Box::new((cgcx, shared_emitter)));
+        let diagnostic_handler_callback_data =
+            Box::into_raw(Box::new(DiagnosticHandlerCallbackData { cgcx, shared_emitter }));
         unsafe {
-            let old_handler = llvm::LLVMRustContextGetDiagnosticHandler(llcx);
+            let old_handler = llvm::LLVMRustContextTakeDiagnosticHandler(llcx);
             llvm::LLVMRustContextConfigureDiagnosticHandler(
                 llcx,
-                diagnostic_handler,
-                data.cast(),
+                diagnostic_handler_callback,
+                diagnostic_handler_callback_data.cast::<c_void>(),
                 remark_passes_all,
                 remark_passes.as_ptr(),
                 remark_passes.len(),
@@ -378,7 +391,7 @@ impl<'a> DiagnosticHandlers<'a> {
                 remark_file.as_ref().map(|dir| dir.as_ptr()).unwrap_or(std::ptr::null()),
                 pgo_available,
             );
-            DiagnosticHandlers { data, llcx, old_handler }
+            DiagnosticHandlers { llcx, old_handler, diagnostic_handler_callback_data }
         }
     }
 }
@@ -387,7 +400,7 @@ impl<'a> Drop for DiagnosticHandlers<'a> {
     fn drop(&mut self) {
         unsafe {
             llvm::LLVMRustContextSetDiagnosticHandler(self.llcx, self.old_handler);
-            drop(Box::from_raw(self.data));
+            drop(Box::from_raw(self.diagnostic_handler_callback_data));
         }
     }
 }
@@ -418,11 +431,21 @@ fn report_inline_asm(
     InlineAsmError { lo, hi, msg, level, source }
 }
 
-unsafe extern "C" fn diagnostic_handler(info: &DiagnosticInfo, user: *mut c_void) {
-    if user.is_null() {
+unsafe extern "C" fn diagnostic_handler_callback(info: &DiagnosticInfo, data: *mut c_void) {
+    if data.is_null() {
         return;
     }
-    let (cgcx, shared_emitter) = unsafe { *(user as *const (&CodegenContext, &SharedEmitter)) };
+    // After casting the data pointer, pass it into an inner function to limit its lifetimes.
+    diagnostic_handler_callback_inner(info, unsafe {
+        &*data.cast::<DiagnosticHandlerCallbackData<'_>>()
+    });
+}
+
+fn diagnostic_handler_callback_inner(
+    info: &DiagnosticInfo,
+    data: &DiagnosticHandlerCallbackData<'_>,
+) {
+    let &DiagnosticHandlerCallbackData { cgcx, shared_emitter } = data;
 
     let dcx = DiagCtxt::new(Box::new(shared_emitter.clone()));
     let dcx = dcx.handle();

compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs

@@ -10,7 +10,6 @@ use rustc_codegen_ssa::debuginfo::type_names::{VTableNameKind, cpp_like_debuginf
 use rustc_codegen_ssa::traits::*;
 use rustc_hir::def::{CtorKind, DefKind};
 use rustc_hir::def_id::{DefId, LOCAL_CRATE};
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::{
     HasTypingEnv, LayoutOf, TyAndLayout, WIDE_PTR_ADDR, WIDE_PTR_EXTRA,
 };

compiler/rustc_codegen_llvm/src/intrinsic.rs

@@ -19,7 +19,6 @@ use rustc_hir as hir;
 use rustc_hir::def_id::LOCAL_CRATE;
 use rustc_lint_defs::builtin::DEPRECATED_LLVM_INTRINSIC;
 use rustc_middle::mir::BinOp;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::{FnAbiOf, HasTyCtxt, HasTypingEnv, LayoutOf};
 use rustc_middle::ty::offload_meta::OffloadMetadata;
 use rustc_middle::ty::{self, GenericArgsRef, Instance, SimdAlign, Ty, TyCtxt};

compiler/rustc_codegen_llvm/src/llvm/ffi.rs

@@ -731,10 +731,12 @@ pub(crate) struct OperandBundle<'a>(InvariantOpaque<'a>);
 pub(crate) struct Linker<'a>(InvariantOpaque<'a>);
 
 unsafe extern "C" {
+    /// Corresponds to LLVM's `DiagnosticHandler`.
     pub(crate) type DiagnosticHandler;
 }
 
-pub(crate) type DiagnosticHandlerTy = unsafe extern "C" fn(&DiagnosticInfo, *mut c_void);
+/// Must match the declaration of `LLVMRustDiagnosticHandlerCallback`.
+pub(crate) type DiagnosticHandlerCallback = unsafe extern "C" fn(&DiagnosticInfo, *mut c_void);
 
 pub(crate) mod debuginfo {
     use bitflags::bitflags;
@@ -2578,17 +2580,23 @@ unsafe extern "C" {
         data: &ThinLTOData,
     );
 
-    pub(crate) fn LLVMRustContextGetDiagnosticHandler(
+    /// Removes the currently-installed `DiagnosticHandler`, and returns an owning pointer to it.
+    pub(crate) fn LLVMRustContextTakeDiagnosticHandler(
         Context: &Context,
-    ) -> Option<&DiagnosticHandler>;
+    ) -> Option<ptr::NonNull<DiagnosticHandler>>;
+
+    /// Installs a diagnostic handler that was previously removed by
+    /// [`LLVMRustContextTakeDiagnosticHandler`].
     pub(crate) fn LLVMRustContextSetDiagnosticHandler(
         context: &Context,
-        diagnostic_handler: Option<&DiagnosticHandler>,
+        diagnostic_handler: Option<ptr::NonNull<DiagnosticHandler>>,
     );
+
+    /// Installs a custom diagnostic handler.
     pub(crate) fn LLVMRustContextConfigureDiagnosticHandler(
         context: &Context,
-        diagnostic_handler_callback: DiagnosticHandlerTy,
-        diagnostic_handler_context: *mut c_void,
+        diagnostic_handler_callback: DiagnosticHandlerCallback,
+        diagnostic_handler_callback_data: *mut c_void,
         remark_all_passes: bool,
         remark_passes: *const *const c_char,
         remark_passes_len: usize,

compiler/rustc_codegen_ssa/src/base.rs

@@ -27,7 +27,6 @@ use rustc_middle::mir::interpret::{CTFE_ALLOC_SALT, ErrorHandled, Scalar};
 use rustc_middle::mir::{BinOp, ConstValue};
 use rustc_middle::mono::{CodegenUnit, CodegenUnitNameBuilder, MonoItem, MonoItemPartitions};
 use rustc_middle::query::Providers;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::{HasTyCtxt, HasTypingEnv, LayoutOf, TyAndLayout};
 use rustc_middle::ty::{self, Instance, PatternKind, Ty, TyCtxt, UintTy, Unnormalized};
 use rustc_session::config::{self, EntryFnType};

compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs

@@ -20,7 +20,6 @@ use rustc_hashes::Hash64;
 use rustc_hir::def_id::DefId;
 use rustc_hir::definitions::{DefPathData, DefPathDataName, DisambiguatedDefPathData};
 use rustc_hir::{CoroutineDesugaring, CoroutineKind, CoroutineSource, Mutability};
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::{IntegerExt, TyAndLayout};
 use rustc_middle::ty::{
     self, ExistentialProjection, GenericArgKind, GenericArgsRef, Ty, TyCtxt, Unnormalized,

compiler/rustc_codegen_ssa/src/mir/constant.rs

@@ -1,7 +1,6 @@
 use rustc_abi::BackendRepr;
 use rustc_middle::mir;
 use rustc_middle::mir::interpret::ErrorHandled;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::{HasTyCtxt, HasTypingEnv};
 use rustc_middle::ty::{self, Ty};
 use rustc_span::{bug, span_bug};

compiler/rustc_codegen_ssa/src/mir/intrinsic.rs

@@ -1,6 +1,5 @@
 use rustc_abi::{Align, FieldIdx, WrappingRange};
 use rustc_middle::mir::SourceInfo;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::{self, Ty, TyCtxt};
 use rustc_session::config::OptLevel;
 use rustc_span::{ErrorGuaranteed, bug, span_bug, sym};

compiler/rustc_codegen_ssa/src/mir/operand.rs

@@ -8,7 +8,6 @@ use rustc_abi::{
 use rustc_attr_ir::lang_items::LangItem;
 use rustc_middle::mir::interpret::{Pointer, Scalar, alloc_range};
 use rustc_middle::mir::{self, ConstValue};
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::{LayoutOf, TyAndLayout};
 use rustc_middle::ty::{self, Ty};
 use rustc_session::config::{AnnotateMoves, DebugInfo, OptLevel};

compiler/rustc_codegen_ssa/src/mir/rvalue.rs

@@ -5,7 +5,6 @@ use rustc_abi::{self as abi, BackendRepr, FIRST_VARIANT};
 use rustc_index::IndexVec;
 use rustc_middle::mir;
 use rustc_middle::ty::adjustment::PointerCoercion;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::{HasTyCtxt, HasTypingEnv, LayoutOf, TyAndLayout};
 use rustc_middle::ty::{self, Instance, Mutability, Ty, TyCtxt};
 use rustc_session::config::OptLevel;

compiler/rustc_const_eval/src/const_eval/machine.rs

@@ -13,7 +13,6 @@ use rustc_lint_defs::builtin::LONG_RUNNING_CONST_EVAL;
 use rustc_middle::mir::AssertMessage;
 use rustc_middle::mir::interpret::ReportedErrorInfo;
 use rustc_middle::query::TyCtxtAt;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::{HasTyCtxt, HasTypingEnv, TyAndLayout, ValidityRequirement};
 use rustc_middle::ty::{self, FieldInfo, ScalarInt, Ty, TyCtxt};
 use rustc_middle::{mir, throw_machine_stop};

compiler/rustc_const_eval/src/const_eval/mod.rs

@@ -2,7 +2,6 @@
 
 use rustc_abi::{FieldIdx, VariantIdx};
 use rustc_middle::mir;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::{self, Ty, TyCtxt};
 use rustc_span::{DUMMY_SP, bug};
 use tracing::instrument;

compiler/rustc_const_eval/src/const_eval/valtrees.rs

@@ -3,7 +3,6 @@ use rustc_data_structures::fx::{FxHashMap, FxHashSet};
 use rustc_middle::mir;
 use rustc_middle::mir::interpret::{EvalToValTreeResult, GlobalId, ValTreeCreationError};
 use rustc_middle::traits::ObligationCause;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::{LayoutCx, TyAndLayout};
 use rustc_middle::ty::{self, Ty, TyCtxt};
 use rustc_span::{DUMMY_SP, bug};

compiler/rustc_const_eval/src/interpret/cast.rs

@@ -6,7 +6,6 @@ use rustc_apfloat::{Float, FloatConvert};
 use rustc_middle::mir::CastKind;
 use rustc_middle::mir::interpret::{InterpResult, PointerArithmetic, Scalar};
 use rustc_middle::ty::adjustment::PointerCoercion;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::{IntegerExt, TyAndLayout};
 use rustc_middle::ty::{self, FloatTy, Ty};
 use rustc_span::{bug, span_bug};

compiler/rustc_const_eval/src/interpret/intrinsics/atomic.rs

@@ -1,5 +1,4 @@
 use rustc_middle::mir::BinOp;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::{mir, ty};
 use rustc_span::{Symbol, span_bug, sym};
 use tracing::trace;

compiler/rustc_const_eval/src/interpret/intrinsics/simd.rs

@@ -3,7 +3,6 @@ use rustc_abi::{BackendRepr, Endian};
 use rustc_apfloat::ieee::{Double, Half, Quad, Single};
 use rustc_apfloat::{Float, Round};
 use rustc_middle::mir::interpret::{InterpErrorKind, Pointer, UndefinedBehaviorInfo};
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::{FloatTy, ScalarInt, SimdAlign};
 use rustc_middle::{err_ub_format, mir, throw_unsup_format, ty};
 use rustc_span::{Symbol, bug, span_bug, sym};

compiler/rustc_hir_analysis/src/check/check.rs

@@ -20,7 +20,6 @@ use rustc_macros::Diagnostic;
 use rustc_middle::hir::nested_filter;
 use rustc_middle::middle::resolve_bound_vars::ResolvedArg;
 use rustc_middle::middle::stability::EvalResult;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::error::TypeErrorToStringExt;
 use rustc_middle::ty::layout::LayoutError;
 use rustc_middle::ty::util::Discr;

compiler/rustc_hir_analysis/src/check/intrinsic.rs

@@ -4,7 +4,6 @@ use rustc_attr_ir::lang_items::LangItem;
 use rustc_errors::DiagMessage;
 use rustc_hir as hir;
 use rustc_middle::traits::{ObligationCause, ObligationCauseCode};
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::{self, Const, Ty, TyCtxt};
 use rustc_span::def_id::LocalDefId;
 use rustc_span::{Span, Symbol, sym};

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -42,7 +42,6 @@ use rustc_infer::traits::DynCompatibilityViolation;
 use rustc_lint_defs::builtin::AMBIGUOUS_ASSOCIATED_ITEMS;
 use rustc_macros::{TypeFoldable, TypeVisitable};
 use rustc_middle::middle::stability::AllowUnstable;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::{
     self, Const, FnSigKind, GenericArgKind, GenericArgsRef, GenericParamDefKind, LitToConstInput,
     Ty, TyCtxt, TypeSuperFoldable, TypeVisitableExt, TypingMode, Unnormalized, Upcast,

compiler/rustc_hir_typeck/src/expr.rs

@@ -28,7 +28,6 @@ use rustc_infer::infer::{self, DefineOpaqueTypes, InferOk, RegionVariableOrigin}
 use rustc_infer::traits::WellFormedLoc;
 use rustc_infer::traits::query::NoSolution;
 use rustc_middle::ty::adjustment::{Adjust, Adjustment, AllowTwoPhase};
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::error::{ExpectedFound, TypeError};
 use rustc_middle::ty::{self, AdtKind, GenericArgsRef, Ty, TypeVisitableExt, Unnormalized};
 use rustc_session::diagnostics::feature_err;

compiler/rustc_hir_typeck/src/fn_ctxt/suggestions.rs

@@ -18,7 +18,6 @@ use rustc_hir::{
 use rustc_hir_analysis::hir_ty_lowering::HirTyLowerer;
 use rustc_hir_analysis::suggest_impl_trait;
 use rustc_middle::middle::stability::EvalResult;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::print::{with_no_trimmed_paths, with_types_for_suggestion};
 use rustc_middle::ty::{
     self, Article, Binder, IsSuggestable, Ty, TyCtxt, TypeVisitableExt, Unnormalized, Upcast,

compiler/rustc_hir_typeck/src/inline_asm.rs

@@ -6,7 +6,6 @@ use rustc_errors::{Diag, DiagCtxtHandle, Diagnostic, Level};
 use rustc_hir as hir;
 use rustc_hir::def_id::DefId;
 use rustc_lint_defs::builtin::ASM_SUB_REGISTER;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::{
     self, Article, FloatTy, IntTy, Ty, TyCtxt, TypeVisitableExt, UintTy, Unnormalized,
 };

compiler/rustc_hir_typeck/src/pat.rs

@@ -21,7 +21,6 @@ use rustc_hir_analysis::autoderef::report_autoderef_recursion_limit_error;
 use rustc_infer::infer::RegionVariableOrigin;
 use rustc_lint_defs::builtin::NON_EXHAUSTIVE_OMITTED_PATTERNS;
 use rustc_middle::traits::PatternOriginExpr;
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::{self, Pinnedness, Ty, TypeVisitableExt, Unnormalized};
 use rustc_session::diagnostics::feature_err;
 use rustc_span::edit_distance::find_best_match_for_name;

compiler/rustc_lint/src/builtin.rs

@@ -33,7 +33,6 @@ use rustc_hir::{self as hir, Body, FnDecl, ImplItemImplKind, PatKind, PredicateO
 // Lints from rustc_lint_defs
 pub use rustc_lint_defs::builtin::*;
 use rustc_lint_defs::{declare_lint, declare_lint_pass, fcw, impl_lint_pass};
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::LayoutOf;
 use rustc_middle::ty::print::with_no_trimmed_paths;
 use rustc_middle::ty::{

compiler/rustc_lint/src/types.rs

@@ -7,7 +7,6 @@ use rustc_attr_ir::lang_items::LangItem;
 use rustc_hir as hir;
 use rustc_hir::{Expr, ExprKind, HirId};
 use rustc_lint_defs::{declare_lint, declare_lint_pass, impl_lint_pass};
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::layout::{LayoutOf, SizeSkeleton};
 use rustc_middle::ty::{self, Ty, TyCtxt, TypeVisitableExt, Unnormalized};
 use rustc_span::{DUMMY_SP, Span, Symbol, bug, sym};

compiler/rustc_lint/src/unused/must_use.rs

@@ -8,7 +8,6 @@ use rustc_hir::def::{DefKind, Res};
 use rustc_hir::def_id::DefId;
 use rustc_infer::traits::util::elaborate;
 use rustc_lint_defs::{declare_lint, declare_lint_pass};
-use rustc_middle::ty::consts::ConstExt;
 use rustc_middle::ty::{self, Ty, Unnormalized};
 use rustc_span::{Span, Symbol, sym};
 use tracing::instrument;