diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2017-05-17 08:01:04 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2017-06-01 12:56:30 -0400 |
| commit | 6c4b961effdbec1bb2fc5aaed5aeb219eb7f3b19 (patch) | |
| tree | 233aa1400d06b283de46fb2c624461c29045e386 /src/librustc_trans | |
| parent | 4ed2edaafe82fb8d44e81e00ca3e4f7659855ba2 (diff) | |
| download | rust-6c4b961effdbec1bb2fc5aaed5aeb219eb7f3b19.tar.gz rust-6c4b961effdbec1bb2fc5aaed5aeb219eb7f3b19.zip | |
move projection mode into parameter environment
Diffstat (limited to 'src/librustc_trans')
| -rw-r--r-- | src/librustc_trans/context.rs | 8 | ||||
| -rw-r--r-- | src/librustc_trans/glue.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/librustc_trans/context.rs b/src/librustc_trans/context.rs index c3b16c2d07d..56f51cae147 100644 --- a/src/librustc_trans/context.rs +++ b/src/librustc_trans/context.rs @@ -320,15 +320,15 @@ impl<'b, 'tcx> SharedCrateContext<'b, 'tcx> { } pub fn type_needs_drop(&self, ty: Ty<'tcx>) -> bool { - ty.needs_drop(self.tcx, ty::ParamEnv::empty()) + ty.needs_drop(self.tcx, ty::ParamEnv::empty(traits::Reveal::All)) } pub fn type_is_sized(&self, ty: Ty<'tcx>) -> bool { - ty.is_sized(self.tcx, ty::ParamEnv::empty(), DUMMY_SP) + ty.is_sized(self.tcx, ty::ParamEnv::empty(traits::Reveal::All), DUMMY_SP) } pub fn type_is_freeze(&self, ty: Ty<'tcx>) -> bool { - ty.is_freeze(self.tcx, ty::ParamEnv::empty(), DUMMY_SP) + ty.is_freeze(self.tcx, ty::ParamEnv::empty(traits::Reveal::All), DUMMY_SP) } pub fn exported_symbols<'a>(&'a self) -> &'a NodeSet { @@ -735,7 +735,7 @@ impl<'a, 'tcx> LayoutTyper<'tcx> for &'a SharedCrateContext<'a, 'tcx> { return TyLayout { ty: ty, layout: layout, variant_index: None }; } - self.tcx().infer_ctxt((), traits::Reveal::All).enter(|infcx| { + self.tcx().infer_ctxt(traits::Reveal::All).enter(|infcx| { infcx.layout_of(ty).unwrap_or_else(|e| { match e { ty::layout::LayoutError::SizeOverflow(_) => diff --git a/src/librustc_trans/glue.rs b/src/librustc_trans/glue.rs index fa400b54d27..f473d957a90 100644 --- a/src/librustc_trans/glue.rs +++ b/src/librustc_trans/glue.rs @@ -46,7 +46,7 @@ pub fn needs_drop_glue<'a, 'tcx>(scx: &SharedCrateContext<'a, 'tcx>, t: Ty<'tcx> ty::TyAdt(def, _) if def.is_box() => { let typ = t.boxed_ty(); if !scx.type_needs_drop(typ) && scx.type_is_sized(typ) { - scx.tcx().infer_ctxt((), traits::Reveal::All).enter(|infcx| { + scx.tcx().infer_ctxt(traits::Reveal::All).enter(|infcx| { let layout = t.layout(&infcx).unwrap(); if layout.size(scx).bytes() == 0 { // `Box<ZeroSizeType>` does not allocate. |
