bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Uplift BoundVar

Browse source
This commit is contained in:
Michael Goulet 2023-11-04 16:49:20 +00:00
parent 0ff8610964
commit f26e8ff3ac
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_middle/src/ty/mod.rs
View file

@ -94,7 +94,7 @@ pub use self::parameterized::ParameterizedOverTcx;
pub use self::rvalue_scopes::RvalueScopes; pub use self::rvalue_scopes::RvalueScopes;
pub use self::sty::BoundRegionKind::*; pub use self::sty::BoundRegionKind::*;
pub use self::sty::{ pub use self::sty::{
AliasTy, Article, Binder, BoundRegion, BoundRegionKind, BoundTy, BoundTyKind, BoundVar, AliasTy, Article, Binder, BoundRegion, BoundRegionKind, BoundTy, BoundTyKind,
BoundVariableKind, CanonicalPolyFnSig, ClauseKind, ClosureArgs, ClosureArgsParts, ConstKind, BoundVariableKind, CanonicalPolyFnSig, ClauseKind, ClosureArgs, ClosureArgsParts, ConstKind,
CoroutineArgs, CoroutineArgsParts, EarlyParamRegion, ExistentialPredicate, CoroutineArgs, CoroutineArgsParts, EarlyParamRegion, ExistentialPredicate,
ExistentialProjection, ExistentialTraitRef, FnSig, GenSig, InlineConstArgs, ExistentialProjection, ExistentialTraitRef, FnSig, GenSig, InlineConstArgs,

7
compiler/rustc_middle/src/ty/sty.rs
View file

@ -32,6 +32,7 @@ use std::fmt;
use std::ops::{ControlFlow, Deref, Range}; use std::ops::{ControlFlow, Deref, Range};
use ty::util::IntTypeExt; use ty::util::IntTypeExt;
use rustc_type_ir::BoundVar;
use rustc_type_ir::ClauseKind as IrClauseKind; use rustc_type_ir::ClauseKind as IrClauseKind;
use rustc_type_ir::CollectAndApply; use rustc_type_ir::CollectAndApply;
use rustc_type_ir::ConstKind as IrConstKind; use rustc_type_ir::ConstKind as IrConstKind;
@ -1621,12 +1622,6 @@ impl Atom for RegionVid {
} }
} }
rustc_index::newtype_index! {
#[derive(HashStable)]
#[debug_format = "{}"]
pub struct BoundVar {}
}
#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, TyEncodable, TyDecodable)] #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, TyEncodable, TyDecodable)]
#[derive(HashStable)] #[derive(HashStable)]
pub struct BoundTy { pub struct BoundTy {

7
compiler/rustc_type_ir/src/lib.rs
View file

@ -332,3 +332,10 @@ impl UniverseIndex {
self.private < other.private self.private < other.private
} }
} }
rustc_index::newtype_index! {
#[cfg_attr(feature = "nightly", derive(HashStable_NoContext))]
#[debug_format = "{}"]
#[gate_rustc_only]
pub struct BoundVar {}
}