Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 4 pull requests #61962

Merged
merged 8 commits into from
Jun 19, 2019
Merged

Rollup of 4 pull requests #61962

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f4737d5
Make Place::ty iterate
spastorino Jun 18, 2019
8b21b07
Add functions to build raw slices
oli-obk Jun 19, 2019
0b58bb3
Support `cfg` and `cfg_attr` on generic parameters
petrochenkov Jun 5, 2019
5a411a6
Update rustfmt and rls
topecongiro Jun 18, 2019
564326a
Rollup merge of #60667 - oli-obk:raw_from_raw_parts, r=sfackler
Centril Jun 19, 2019
7b3984b
Rollup merge of #61547 - petrochenkov:cfgen, r=Centril
Centril Jun 19, 2019
d88b7b2
Rollup merge of #61861 - topecongiro:rustfmt-1.3.0, r=topecongiro
Centril Jun 19, 2019
bf6c505
Rollup merge of #61940 - spastorino:place-ty-iterate, r=oli-obk
Centril Jun 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Make Place::ty iterate
  • Loading branch information
@spastorino
spastorino committed Jun 18, 2019
commit f4737d5607eabbfc07440b0ce64b852395948a68
26 changes: 19 additions & 7 deletions src/librustc/mir/tcx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,25 @@ impl<'tcx> Place<'tcx> {
where
D: HasLocalDecls<'tcx>,
{
match *self {
Place::Base(PlaceBase::Local(index)) =>
PlaceTy::from_ty(local_decls.local_decls()[index].ty),
Place::Base(PlaceBase::Static(ref data)) =>
PlaceTy::from_ty(data.ty),
Place::Projection(ref proj) =>
proj.base.ty(local_decls, tcx).projection_ty(tcx, &proj.elem),
self.iterate(|place_base, place_projections| {
let mut place_ty = place_base.ty(local_decls);

for proj in place_projections {
place_ty = place_ty.projection_ty(tcx, &proj.elem);
}

place_ty
})
}
}

impl<'tcx> PlaceBase<'tcx> {
pub fn ty<D>(&self, local_decls: &D) -> PlaceTy<'tcx>
where D: HasLocalDecls<'tcx>
{
match self {
PlaceBase::Local(index) => PlaceTy::from_ty(local_decls.local_decls()[*index].ty),
PlaceBase::Static(data) => PlaceTy::from_ty(data.ty),
}
}
}
Expand Down