user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TyClosure no longer needs to use freshen_closure_like

Browse source 
All the data is now part of its type.
This commit is contained in:
Niko Matsakis 2017-11-08 17:33:29 -05:00
parent e6fca1d565
commit 7c609eb090
1 changed files with 3 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/librustc/infer/freshen.rs
View file

@ -103,7 +103,7 @@ impl<'a, 'gcx, 'tcx> TypeFreshener<'a, 'gcx, 'tcx> {
self.infcx.tcx.mk_infer(freshener(index))
}
fn freshen_closure_like<M, C>(&mut self,
fn freshen_generator_like<M, C>(&mut self,
def_id: DefId,
substs: ty::ClosureSubsts<'tcx>,
t: Ty<'tcx>,
@ -249,19 +249,8 @@ impl<'a, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for TypeFreshener<'a, 'gcx, 'tcx> {
t
}
ty::TyClosure(def_id, substs) => {
self.freshen_closure_like(
def_id, substs, t,
|this| {
let closure_sig = this.infcx.fn_sig(def_id);
(tcx.mk_fn_ptr(closure_sig.fold_with(this)), tcx.types.char)
},
|substs| tcx.mk_closure(def_id, ty::ClosureSubsts { substs })
)
}
ty::TyGenerator(def_id, substs, interior) => {
self.freshen_closure_like(
self.freshen_generator_like(
def_id, substs, t,
|this| {
let gen_sig = this.infcx.generator_sig(def_id).unwrap();
@ -300,6 +289,7 @@ impl<'a, 'gcx, 'tcx> TypeFolder<'gcx, 'tcx> for TypeFreshener<'a, 'gcx, 'tcx> {
ty::TyProjection(..) |
ty::TyForeign(..) |
ty::TyParam(..) |
ty::TyClosure(..) |
ty::TyAnon(..) => {
t.super_fold_with(self)
}