Cleanup mir/borrowck #55122
Merged
Cleanup mir/borrowck #55122
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 has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Mark-Simulacrum
approved these changes
Oct 16, 2018
| @@ -92,12 +92,12 @@ impl<'tcx> fmt::Display for BorrowData<'tcx> { | |||
| mir::BorrowKind::Mut { .. } => "mut ", | |||
| }; | |||
| let region = self.region.to_string(); | |||
| let region = if region.len() > 0 { | |||
| format!("{} ", region) | |||
| let separator = if region.len() > 0 { | |||
There was a problem hiding this comment.
hm, traditionally I think we've been refactoring this to !region.is_empty()
There was a problem hiding this comment.
We have, I just missed that one; I'll update shortly.
ljedrz
force-pushed
the
cleanup_mir_borrowck
branch
from
2d9b9d1 to
f636079
Compare
|
@Mark-Simulacrum comment addressed. |
|
☔ The latest upstream changes (presumably #54941) made this pull request unmergeable. Please resolve the merge conflicts. |
ljedrz
force-pushed
the
cleanup_mir_borrowck
branch
from
f636079 to
5620f6d
Compare
|
Rebased. |
|
@bors r+ rollup |
|
📌 Commit 5620f6d has been approved by |
bors
added
S-waiting-on-bors
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Oct 18, 2018
…-Simulacrum Cleanup mir/borrowck - remove a redundant `.clone()` - a few string tweaks - deduplicate assignments and `return`s - simplify common patterns - remove redundant `return`s
bors
added a commit
that referenced
this pull request
Oct 18, 2018
Rollup of 18 pull requests Successful merges: - #54646 (improve documentation on std::thread::sleep) - #54933 (Cleanup the rest of codegen_llvm) - #54964 (Run both lldb and gdb tests) - #55016 (Deduplicate some code and compile-time values around vtables) - #55031 (Improve verify_llvm_ir config option) - #55050 (doc std::fmt: the Python inspiration is already mentioned in precedin…) - #55077 (rustdoc: Use dyn keyword when rendering dynamic traits) - #55080 (Detect if access to localStorage is forbidden by the user's browser) - #55090 (regression test for move out of borrow via pattern) - #55102 (resolve: Do not skip extern prelude during speculative resolution) - #55104 (Add test for #34229) - #55111 ([Rustc Book] Explain --cfg's arguments) - #55122 (Cleanup mir/borrowck) - #55127 (Remove HybridBitSet::dummy) - #55128 (Fix LLVMRustInlineAsmVerify return type mismatch) - #55142 (miri: layout should not affect CTFE checks (outside of validation)) - #55151 (Cleanup nll) - #55161 ([librustdoc] Disable spellcheck for search field)
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
.clone()returnsreturns