Skip to content

Commit 6bb1652

Browse files
committed
Auto merge of #163165 - JonathanBrouwer:rollup-qpPoMbu, r=JonathanBrouwer
Rollup of 8 pull requests Successful merges: - #162628 (Move `Const` from `rustc_middle` to `rustc_type_ir`) - #159589 (Avoid leaking opaque hidden types via auto trait candidates) - #147790 (constify comparison traits on sliced types) - #162325 (powerpc64-ibm-aix: fix cfg(target_abi) value) - #162786 (regression test for GCE inherent projection ICE) - #163065 (windows Dir::rename: remove incorrect is_dir query) - #163138 (feat(time): add `Duration::{WEEK, DAY, HOUR, MINUTE}`) - #163162 (Remove unused `make3.sh` CI script)
2 parents b794652 + ac9633b commit 6bb1652

156 files changed

Lines changed: 1794 additions & 1133 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎compiler/rustc_borrowck/src/type_check/mod.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ use rustc_middle::mir::*;
2424
use rustc_middle::traits::query::NoSolution;
2525
use rustc_middle::ty::adjustment::PointerCoercion;
2626
use rustc_middle::ty::cast::CastTy;
27+
use rustc_middle::ty::consts::ConstExt;
2728
use rustc_middle::ty::{
2829
self, CanonicalUserTypeAnnotation, CanonicalUserTypeAnnotations, GenericArgsRef, Ty, TyCtxt,
2930
TypeVisitableExt, UserArgs, UserTypeAnnotationIndex, fold_regions,

‎compiler/rustc_codegen_cranelift/src/base.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ use rustc_hir::attrs::lang_items::LangItem;
1212
use rustc_index::IndexVec;
1313
use rustc_middle::ty::TypeVisitableExt;
1414
use rustc_middle::ty::adjustment::PointerCoercion;
15+
use rustc_middle::ty::consts::ConstExt;
1516
use rustc_middle::ty::layout::{FnAbiOf, HasTypingEnv as _};
1617
use rustc_middle::ty::print::with_no_trimmed_paths;
1718
use rustc_session::config::OutputFilenames;

‎compiler/rustc_codegen_cranelift/src/debuginfo/types.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
use gimli::write::{AttributeValue, UnitEntryId};
44
use rustc_codegen_ssa::debuginfo::type_names;
55
use rustc_data_structures::fx::FxHashMap;
6+
use rustc_middle::ty::consts::ConstExt;
67
use rustc_middle::ty::layout::LayoutOf;
78
use rustc_middle::ty::{self, Ty, TyCtxt};
89

‎compiler/rustc_codegen_cranelift/src/intrinsics/simd.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
use cranelift_codegen::ir::immediates::Offset32;
44
use rustc_abi::Endian;
55
use rustc_middle::ty::SimdAlign;
6+
use rustc_middle::ty::consts::ConstExt;
67

78
use super::*;
89
use crate::prelude::*;

‎compiler/rustc_codegen_cranelift/src/unsize.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
//! [`PointerCoercion::Unsize`]: `rustc_middle::ty::adjustment::PointerCoercion::Unsize`
44
55
use rustc_codegen_ssa::base::validate_trivial_unsize;
6+
use rustc_middle::ty::consts::ConstExt;
67
use rustc_middle::ty::layout::HasTypingEnv;
78
use rustc_middle::ty::print::{with_no_trimmed_paths, with_no_visible_paths};
89

‎compiler/rustc_codegen_gcc/src/intrinsic/simd.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ use rustc_codegen_ssa::traits::{BaseTypeCodegenMethods, BuilderMethods, LayoutTy
1515
#[cfg(feature = "master")]
1616
use rustc_hir as hir;
1717
use rustc_middle::mir::BinOp;
18+
use rustc_middle::ty::consts::ConstExt;
1819
use rustc_middle::ty::layout::{HasTyCtxt, LayoutOf};
1920
use rustc_middle::ty::{self, Ty};
2021
use rustc_span::{ErrorGuaranteed, Span, Symbol, span_bug, sym};

‎compiler/rustc_codegen_llvm/src/debuginfo/metadata.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ use rustc_codegen_ssa::debuginfo::type_names::{VTableNameKind, cpp_like_debuginf
1010
use rustc_codegen_ssa::traits::*;
1111
use rustc_hir::def::{CtorKind, DefKind};
1212
use rustc_hir::def_id::{DefId, LOCAL_CRATE};
13+
use rustc_middle::ty::consts::ConstExt;
1314
use rustc_middle::ty::layout::{
1415
HasTypingEnv, LayoutOf, TyAndLayout, WIDE_PTR_ADDR, WIDE_PTR_EXTRA,
1516
};

‎compiler/rustc_codegen_llvm/src/intrinsic.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ use rustc_hir::def_id::LOCAL_CRATE;
1919
use rustc_hir::find_attr;
2020
use rustc_lint_defs::builtin::DEPRECATED_LLVM_INTRINSIC;
2121
use rustc_middle::mir::BinOp;
22+
use rustc_middle::ty::consts::ConstExt;
2223
use rustc_middle::ty::layout::{FnAbiOf, HasTyCtxt, HasTypingEnv, LayoutOf};
2324
use rustc_middle::ty::offload_meta::OffloadMetadata;
2425
use rustc_middle::ty::{self, GenericArgsRef, Instance, SimdAlign, Ty, TyCtxt, TypingEnv};

‎compiler/rustc_codegen_ssa/src/base.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ use rustc_middle::mir::interpret::{CTFE_ALLOC_SALT, ErrorHandled, Scalar};
2626
use rustc_middle::mir::{BinOp, ConstValue};
2727
use rustc_middle::mono::{CodegenUnit, CodegenUnitNameBuilder, MonoItem, MonoItemPartitions};
2828
use rustc_middle::query::Providers;
29+
use rustc_middle::ty::consts::ConstExt;
2930
use rustc_middle::ty::layout::{HasTyCtxt, HasTypingEnv, LayoutOf, TyAndLayout};
3031
use rustc_middle::ty::{self, Instance, PatternKind, Ty, TyCtxt, UintTy, Unnormalized};
3132
use rustc_session::config::{self, EntryFnType};

‎compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ use rustc_hashes::Hash64;
2020
use rustc_hir::def_id::DefId;
2121
use rustc_hir::definitions::{DefPathData, DefPathDataName, DisambiguatedDefPathData};
2222
use rustc_hir::{CoroutineDesugaring, CoroutineKind, CoroutineSource, Mutability};
23+
use rustc_middle::ty::consts::ConstExt;
2324
use rustc_middle::ty::layout::{IntegerExt, TyAndLayout};
2425
use rustc_middle::ty::{
2526
self, ExistentialProjection, GenericArgKind, GenericArgsRef, Ty, TyCtxt, Unnormalized,

0 commit comments

Comments
 (0)