Some Promotion Refactoring #80458
Merged
Some Promotion Refactoring #80458
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
oli-obk
reviewed
Dec 28, 2020
| } | ||
|
|
||
| Rvalue::Ref(_, kind, place) => { | ||
| // Special-case reborrows to be more like a copy of the reference. | ||
| let mut place_simplified = place.as_ref(); | ||
| if let [proj_base @ .., ProjectionElem::Deref] = &place_simplified.projection { | ||
| let base_ty = Place::ty_from(place_simplified.local, proj_base, self.body, self.tcx).ty; | ||
| let base_ty = | ||
| Place::ty_from(place_simplified.local, proj_base, self.body, self.tcx).ty; |
There was a problem hiding this comment.
Just rustfmt, or is there any other difference that I am missing?
There was a problem hiding this comment.
yea, but I was confused why rustfmt would do this.
There was a problem hiding this comment.
Because it is being rustfmt? ;)
The variable name got longer, since I need to keep the original place around. As a result this line crossed the threshold.
There was a problem hiding this comment.
oh... this is due to an intermediate state that was reverted later? Because this specific line is exactly the same (modulo whitespace) as the line that was there before.
There was a problem hiding this comment.
Maybe I didn't fmt between all commits.
|
@bors r+ |
|
📌 Commit 51cec58 has been approved by |
Dylan-DPC-zz
pushed a commit
to Dylan-DPC-zz/rust
that referenced
this pull request
Dec 30, 2020
Some Promotion Refactoring Clean up promotion a bit: * factor out some common code * more exhaustive matches This *should* not break anything... the only potentially-breaking change is that `BorrowKind::Shallow | BorrowKind::Unique` are now rejected for internal references. r? `@oli-obk`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Dec 30, 2020
Rollup of 9 pull requests Successful merges: - rust-lang#78934 (refactor: removing library/alloc/src/vec/mod.rs ignore-tidy-filelength) - rust-lang#79479 (Add `Iterator::intersperse`) - rust-lang#80128 (Edit rustc_ast::ast::FieldPat docs) - rust-lang#80424 (Don't give an error when creating a file for the first time) - rust-lang#80458 (Some Promotion Refactoring) - rust-lang#80488 (Do not create dangling &T in Weak<T>::drop) - rust-lang#80491 (Miri: make size/align_of_val work for dangling raw ptrs) - rust-lang#80495 (Rename kw::Invalid -> kw::Empty) - rust-lang#80513 (Add regression test for rust-lang#80062) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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.
Clean up promotion a bit:
This should not break anything... the only potentially-breaking change is that
BorrowKind::Shallow | BorrowKind::Uniqueare now rejected for internal references.r? @oli-obk