Skip to content

Commit 991a9dc

Browse files
committed
Auto merge of rust-lang#120497 - compiler-errors:modulize, r=lcnr
Move predicate, region, and const stuff into their own modules in middle This PR mostly moves things around, and in a few cases adds some `ty::` to the beginning of names to avoid one-off imports. I don't mean this to be the most *thorough* move/refactor. I just generally wanted to begin to split up `ty/mod.rs` and `ty/sty.rs` which are huge and hard to distinguish, and have a lot of non-ty stuff in them. r? lcnr
2 parents 4d87c4a + 233b213 commit 991a9dc

File tree

5 files changed

+1491
-1456
lines changed

5 files changed

+1491
-1456
lines changed

compiler/rustc_middle/src/ty/consts.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ use rustc_hir as hir;
77
use rustc_hir::def::{DefKind, Res};
88
use rustc_hir::def_id::LocalDefId;
99
use rustc_macros::HashStable;
10+
use rustc_type_ir::ConstKind as IrConstKind;
1011
use rustc_type_ir::{ConstTy, IntoKind, TypeFlags, WithCachedTypeInfo};
1112

1213
mod int;
@@ -19,7 +20,7 @@ use rustc_span::Span;
1920
use rustc_span::DUMMY_SP;
2021
pub use valtree::*;
2122

22-
use super::sty::ConstKind;
23+
pub type ConstKind<'tcx> = IrConstKind<TyCtxt<'tcx>>;
2324

2425
/// Use this rather than `ConstData`, whenever possible.
2526
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash, HashStable)]

0 commit comments

Comments
 (0)