rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Auto merge of #80163 - jackh726:binder-refactor-part-3, r=lcnr

Browse Source 
Make BoundRegion have a kind of BoungRegionKind

Split from #76814

Also includes making `replace_escaping_bound_vars` only return `T`

Going to r? `@lcnr`
Feel free to reassign
This commit is contained in:
bors
2020-12-20 07:01:00 +00:00
parent 29e32120c3 328fcee4af
commit b1964e60b7
47 changed files with 183 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
compiler/rustc_middle/src/ty/mod.rs
View File

@@ -51,13 +51,13 @@ use std::ops::{ControlFlow, Range};
use std::ptr;
use std::str;
pub use self::sty::BoundRegion::*;
pub use self::sty::BoundRegionKind::*;
pub use self::sty::InferTy::*;
pub use self::sty::RegionKind;
pub use self::sty::RegionKind::*;
pub use self::sty::TyKind::*;
pub use self::sty::{Binder, BoundTy, BoundTyKind, BoundVar};
pub use self::sty::{BoundRegion, EarlyBoundRegion, FreeRegion, Region};
pub use self::sty::{BoundRegion, BoundRegionKind, EarlyBoundRegion, FreeRegion, Region};
pub use self::sty::{CanonicalPolyFnSig, FnSig, GenSig, PolyFnSig, PolyGenSig};
pub use self::sty::{ClosureSubsts, GeneratorSubsts, TypeAndMut, UpvarSubsts};
pub use self::sty::{ClosureSubstsParts, GeneratorSubstsParts};
@@ -1607,7 +1607,7 @@ where
}
}
pub type PlaceholderRegion = Placeholder<BoundRegion>;
pub type PlaceholderRegion = Placeholder<BoundRegionKind>;
pub type PlaceholderType = Placeholder<BoundVar>;