Rollup of 6 pull requests #60843
Closed
Rollup of 6 pull requests #60843
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
We only used a bunch of fields when tokenizing into a token tree, so let's move them out of the base lexer
See https://github.com/rust-lang/rust/pull/50838/files#r283296243 for explanation how jointness checking works with *next* pair
* Don't generate an extra lint scope for each `let` statement. * Place match guards inside the visiblility scope of the bindings for their arm.
Also give arms the correct lint scope in MIR.
I was incorrectly under the impression that this would only lead to duplicates. See `mir-opt/match-arm-scope.rs` (upcomming commit) for a case where we didn't emit a fake borrow of `items.1`.
This ensures that we will correctly generate a storage-dead if the initializing expression diverges.
Co-Authored-By: matthewjasper <mjjasper1@gmail.com>
measureme@0.3 adds a version header to the binary file format which will help reduce tool breakage in the future.
More details can be found in rust-lang#60540! Closes rust-lang#60540
Cleanup (pretty) printing of `ty::Const` r? @eddyb addresses https://github.com/rust-lang/rust/pull/59178/files/5cd28066214a4a255bac6655c20bf05cb95730fd#r266243236 and https://github.com/rust-lang/rust/pull/59178/files/5cd28066214a4a255bac6655c20bf05cb95730fd#r266243336
… r=pnkfelix Add match arm scopes and other scope fixes * Add drop and lint scopes for match arms. * Lint attributes are now respected on match arms. * Make sure we emit a StorageDead if we diverge when initializing a temporary. * Adjust MIR pretty printing of scopes for locals. * Don't generate duplicate lint scopes for `let statements`. * Add some previously missing fake borrows for matches. closes rust-lang#46525 cc @rust-lang/compiler
Move token tree related lexer state to a separate struct Just a types-based refactoring. We only used a bunch of fields when tokenizing into a token tree, so let's move them out of the base lexer
Bump measureme dependency to 0.3 measureme@0.3 adds a version header to the binary file format which will help reduce tool breakage in the future.
…=nikic Update LLVM to fix assertion when compiling to wasm More details can be found in rust-lang#60540! Closes rust-lang#60540
CMake: Do not print installation messages for up-to-date files Closes rust-lang#60830
|
@bors r+ p=6 rollup=never |
|
📌 Commit adb05d1 has been approved by |
bors
added
the
S-waiting-on-bors
|
Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem. Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
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.
Successful merges:
ty::Const#59276 (Cleanup (pretty) printing ofty::Const)Failed merges:
Symbolmore in lint APIs #60827 (UseSymbolmore in lint APIs)r? @ghost