Rollup of 10 pull requests #70257
Closed
Rollup of 10 pull requests #70257
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
…tch_single_binding)
As discussed in rust-lang#67939, this allows turning Option<ThreadId> into Option<NonZeroU64> which can then be stored inside an AtomicU64.
Also remove ExtCtxt::struct_span_fatal.
…tely (clippy::let_and_return)
Expand: nix all fatal errors Basically, we go after all `.span_fatal` / `FatalError.raise()` and similar things and remove them one by one until there are no fatal errors left. r? @petrochenkov
…trochenkov parse/lexer: support `StringReader::retokenize` called on external files. This ~~should theoretically~~ fixes rust-lang#69933, ~~but I'm not sure what the best way to test it is~~. **EDIT**: see rust-lang#69933 (comment). r? @petrochenkov cc @Xanewok @staktrace
…trochenkov parser: recover on `for<'a> |...| body` closures When encountering `for` and `<` is 1 token ahead, interpret this as an explicitly quantified generic closure and recover, rather than attempting to parse a `for` loop. This provides both improved diagnostics as well as an insurance policy for the ability to use this as the syntax for generic closures in the future. As requested by r? @eddyb
fix type of const params in associated types. fixes rust-lang#66906 fixes rust-lang#70167 r? @eddyb
Only display definition when suggesting a typo Closes rust-lang#70206 r? @Centril
more clippy fixes * remove unused unit values (clippy::unused_unit) * make some let-if-bindings more idiomatic (clippy::useless_let_if_seq) * clarify when we pass () to functions (clippy::unit_arg) * don't redundantly repeat field names (clippy::redundant_field_names) * remove redundant returns (clippy::needless_return) * use let instead of match for matches with single bindings (clippy::match_single_binding) * don't convert results to options just for matching (clippy::if_let_some_result)
Return NonZeroU64 from ThreadId::as_u64. As discussed in rust-lang#67939, this allows turning Option<ThreadId> into Option<NonZeroU64> which can then be stored inside an AtomicU64.
Remove wrong entry from RELEASES.md resolves rust-lang#70247
Remove another wrong entry from RELEASES.md The entry is under 1.11.0, but the feature is only available since 1.12.0 (for which an identical entry exists). 
couple more clippy fixes (let_and_return, if_same_then_else) * summarize if-else-code with identical blocks (clippy::if_same_then_else) * don't create variable bindings just to return the bound value immediately (clippy::let_and_return)
|
@bors r+ p=10 rollup=never |
|
📌 Commit 688d655 has been approved by |
bors
added
the
S-waiting-on-bors
|
⌛ Testing commit 688d655 with merge 48a5fe5d03499c164e2313b9fec11240ee73c8dc... |
|
💔 Test failed - checks-azure |
bors
added
S-waiting-on-review
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:
StringReader::retokenizecalled on external files. #70172 (parse/lexer: supportStringReader::retokenizecalled on external files.)for<'a> |...| bodyclosures #70209 (parser: recover onfor<'a> |...| bodyclosures)Failed merges:
r? @ghost