Move BoundConst to ty::consts

Author: WaffleLapkin

compiler/rustc_middle/src/ty/bound_const.rs

@@ -1,17 +1,14 @@
-use super::Const;
-use crate::mir;
-use crate::mir::interpret::{AllocId, ConstValue, Scalar};
-use crate::ty::abstract_const::CastKind;
-use crate::ty::subst::{InternalSubsts, SubstsRef};
-use crate::ty::ParamEnv;
-use crate::ty::{self, List, Ty, TyCtxt, TypeVisitableExt};
 use rustc_data_structures::stable_hasher::{HashStable, StableHasher};
 use rustc_errors::ErrorGuaranteed;
 use rustc_hir::def_id::DefId;
 use rustc_macros::HashStable;
 use rustc_target::abi::Size;
 
-use super::ScalarInt;
+use crate::mir;
+use crate::mir::interpret::{AllocId, ConstValue, Scalar};
+use crate::ty::abstract_const::CastKind;
+use crate::ty::subst::{InternalSubsts, SubstsRef};
+use crate::ty::{self, BoundVar, Const, List, ParamEnv, ScalarInt, Ty, TyCtxt, TypeVisitableExt};
 
 /// An unevaluated (potentially generic) constant used in the type-system.
 #[derive(Copy, Clone, Debug, Eq, PartialEq, PartialOrd, Ord, TyEncodable, TyDecodable, Lift)]
@@ -74,6 +71,13 @@ pub enum ConstKind<'tcx> {
     Expr(Expr<'tcx>),
 }
 
+#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, HashStable)]
+#[derive(TyEncodable, TyDecodable, PartialOrd, Ord)]
+pub struct BoundConst<'tcx> {
+    pub var: BoundVar,
+    pub ty: Ty<'tcx>,
+}
+
 impl<'tcx> From<ty::ConstVid<'tcx>> for ConstKind<'tcx> {
     fn from(const_vid: ty::ConstVid<'tcx>) -> Self {
         InferConst::Var(const_vid).into()

compiler/rustc_middle/src/ty/consts/kind.rs

@@ -58,7 +58,6 @@ pub mod walk;
 mod adt;
 mod alias_relation_direction;
 mod assoc;
-mod bound_const;
 mod bound_constness;
 mod c_reader_cache_key;
 mod closure;
@@ -112,7 +111,6 @@ pub use self::alias_relation_direction::AliasRelationDirection;
 pub use self::assoc::*;
 pub use self::binding::BindingMode;
 pub use self::binding::BindingMode::*;
-pub use self::bound_const::BoundConst;
 pub use self::bound_constness::BoundConstness;
 pub use self::c_reader_cache_key::CReaderCacheKey;
 pub use self::closure::{
@@ -126,7 +124,8 @@ pub use self::coherence::{
     CrateInherentImpls, ImplHeader, ImplOverlapKind, ImplPolarity, ImplSubject,
 };
 pub use self::consts::{
-    Const, ConstData, ConstInt, ConstKind, Expr, InferConst, ScalarInt, UnevaluatedConst, ValTree,
+    BoundConst, Const, ConstData, ConstInt, ConstKind, Expr, InferConst, ScalarInt,
+    UnevaluatedConst, ValTree,
 };
 pub use self::context::{
     tls, CtxtInterners, DeducedParamAttrs, FreeRegionInfo, GlobalCtxt, Lift, TyCtxt, TyCtxtFeed,