Place related refactors #60486
Merged
Place related refactors #60486
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rust-highfive
added
the
S-waiting-on-review
petrochenkov
reviewed
May 2, 2019
| Place::Projection(proj) => place = &proj.base, | ||
| Place::Base(PlaceBase::Static(_)) => return None, | ||
| Place::Base(PlaceBase::Local(local)) => return Some(*local), | ||
| } |
There was a problem hiding this comment.
There's one awful way to write this more compactly:
pub fn base_local(mut self: &Self) -> Option<Local> {
loop {
match self {
Place::Projection(proj) => self = &proj.base,
Place::Base(PlaceBase::Static(_)) => return None,
Place::Base(PlaceBase::Local(local)) => return Some(*local),
}
}
}There was a problem hiding this comment.
I don't think it's really important. This code is going away at some point in the future where getting the base is just doing place.base or in this case self.base.
|
@bors r+ |
|
📌 Commit 49f0141 has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
May 3, 2019
… r=oli-obk Place related refactors Meanwhile I was working on Place 2 I'm finding some little things that I had on my branch but preferred to land a separate PR for things that are simpler to merge. r? @oli-obk
Centril
added a commit
to Centril/rust
that referenced
this pull request
May 3, 2019
… r=oli-obk Place related refactors Meanwhile I was working on Place 2 I'm finding some little things that I had on my branch but preferred to land a separate PR for things that are simpler to merge. r? @oli-obk
Centril
added a commit
to Centril/rust
that referenced
this pull request
May 4, 2019
… r=oli-obk Place related refactors Meanwhile I was working on Place 2 I'm finding some little things that I had on my branch but preferred to land a separate PR for things that are simpler to merge. r? @oli-obk
bors
added a commit
that referenced
this pull request
May 4, 2019
Rollup of 9 pull requests Successful merges: - #60429 (Account for paths in incorrect pub qualifier help) - #60449 (Constrain all regions in the concrete type for an opaque type) - #60486 (Place related refactors) - #60513 (Remove -Z borrowck=compare flag) - #60516 (Remove TypeckMir) - #60517 (Reword casting message) - #60520 (Add rustfmt toml) - #60521 (Migrate tidy to rust 2018 edition) - #60527 (Fix async fn lowering ICE with APIT.) Failed merges: r? @ghost
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Meanwhile I was working on Place 2 I'm finding some little things that I had on my branch but preferred to land a separate PR for things that are simpler to merge.
r? @oli-obk