Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Rollup of 5 pull requests #61601

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

Merged
merged 20 commits into from
Jun 6, 2019
Merged

Rollup of 5 pull requests #61601

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
333e1ca
Add Bound::cloned()
czipperz May 30, 2019
867c4a5
Fix compilation errors
czipperz May 31, 2019
0772f9a
Make Bound::cloned public
czipperz May 31, 2019
df84578
Add Bound tests
czipperz May 31, 2019
a21a0e0
Import Bound in tests
czipperz May 31, 2019
c382491
Enable feature bound_cloned
czipperz Jun 1, 2019
c478efb
Enable feature bound_cloned for tests
czipperz Jun 2, 2019
2bdaccb
Make UnsafetyChecker visitor iterate instead of recurse
spastorino Jun 5, 2019
0cfaa28
Make LocalAnalizer visitor iterate instead of recurse
spastorino Jun 5, 2019
4a88614
Take self by value (Self is Copy here)
czipperz Jun 6, 2019
c1bc8f1
Remove dereference
czipperz Jun 6, 2019
cc52746
Make visit_place traverse place and have visit_place_base and visit_p…
spastorino Jun 5, 2019
67197e2
Implement only visit_place_base for monomorphize/collector
spastorino Jun 5, 2019
2bcdee3
Update .mailmap with my name
lnicola Jun 6, 2019
6ba6183
Update .mailmap
pvdrz Jun 6, 2019
654854f
Rollup merge of #61376 - czipperz:bound-cloned, r=sfackler
Centril Jun 6, 2019
4c74056
Rollup merge of #61554 - spastorino:change_visit_api, r=oli-obk
Centril Jun 6, 2019
3fd632a
Rollup merge of #61559 - spastorino:make-visitors-iterate, r=oli-obk
Centril Jun 6, 2019
61f5042
Rollup merge of #61585 - lnicola:mailmap, r=Mark-Simulacrum
Centril Jun 6, 2019
9e97970
Rollup merge of #61591 - christianpoveda:patch-1, r=jonas-schievink
Centril Jun 6, 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
Prev Previous commit
Next Next commit
Make visit_place traverse place and have visit_place_base and visit_p… 
…rojection doing the real work
  • Loading branch information
@spastorino
spastorino committed Jun 6, 2019
commit cc527464bb3c891e062c58cd954c63b556d059ec
58 changes: 31 additions & 27 deletions src/librustc/mir/visit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,17 +151,17 @@ macro_rules! make_mir_visitor {
self.super_place(place, context, location);
}

fn visit_projection(&mut self,
place: & $($mutability)? Projection<'tcx>,
fn visit_place_base(&mut self,
place_base: & $($mutability)? PlaceBase<'tcx>,
context: PlaceContext,
location: Location) {
self.super_projection(place, context, location);
self.super_place_base(place_base, context, location);
}

fn visit_projection_elem(&mut self,
place: & $($mutability)? PlaceElem<'tcx>,
location: Location) {
self.super_projection_elem(place, location);
fn visit_projection(&mut self,
place: & $($mutability)? Projection<'tcx>,
location: Location) {
self.super_projection(place, location);
}

fn visit_constant(&mut self,
Expand Down Expand Up @@ -676,36 +676,40 @@ macro_rules! make_mir_visitor {
context: PlaceContext,
location: Location) {
match place {
Place::Base(PlaceBase::Local(local)) => {
self.visit_local(local, context, location);
}
Place::Base(PlaceBase::Static(box Static { kind: _, ty })) => {
self.visit_ty(& $($mutability)? *ty, TyContext::Location(location));
Place::Base(place_base) => {
self.visit_place_base(place_base, context, location);
}
Place::Projection(proj) => {
self.visit_projection(proj, context, location);
let context = if context.is_mutating_use() {
PlaceContext::MutatingUse(MutatingUseContext::Projection)
} else {
PlaceContext::NonMutatingUse(NonMutatingUseContext::Projection)
};

self.visit_place(& $($mutability)? proj.base, context, location);
self.visit_projection(proj, location);
}
}
}

fn super_projection(&mut self,
proj: & $($mutability)? Projection<'tcx>,
fn super_place_base(&mut self,
place_base: & $($mutability)? PlaceBase<'tcx>,
context: PlaceContext,
location: Location) {
let Projection { base, elem } = proj;
let context = if context.is_mutating_use() {
PlaceContext::MutatingUse(MutatingUseContext::Projection)
} else {
PlaceContext::NonMutatingUse(NonMutatingUseContext::Projection)
};
self.visit_place(base, context, location);
self.visit_projection_elem(elem, location);
match place_base {
PlaceBase::Local(local) => {
self.visit_local(local, context, location);
}
PlaceBase::Static(box Static { kind: _, ty }) => {
self.visit_ty(& $($mutability)? *ty, TyContext::Location(location));
}
}
}

fn super_projection_elem(&mut self,
proj: & $($mutability)? PlaceElem<'tcx>,
location: Location) {
match proj {
fn super_projection(&mut self,
proj: & $($mutability)? Projection<'tcx>,
location: Location) {
match & $($mutability)? proj.elem {
ProjectionElem::Deref => {
}
ProjectionElem::Subslice { from: _, to: _ } => {
Expand Down