Rollup of 11 pull requests #81905
Merged
Rollup of 11 pull requests #81905
Conversation
This file contains hidden or 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
An ICE happened when certain code is compiled in incremental compilation mode and there are two `Ident`s that have the same `StableHash` value but are considered different by `Eq` and `Hash`. The `Ident` issue is now fixed.
Previously, `GetTypedefedType` was invoked unconditionally. But this did not work in case of `rust-lldb` without Rust patches since there was no typedef actually.
Since I was writing some examples for an RFC anyway.
The panic happens when in recovery parsing a full `impl` (`parse_item_impl`) fails and we drop the `DiagnosticBuilder` for the recovery suggestion and return the `parse_item_impl` error. We now raise the original error "expected identifier found `impl`" when parsing the `impl` fails. Note that the regression test is slightly simplified version of the original repro in rust-lang#81806, to make the error output smaller and more resilient to unrelated changes in parser error messages. Fixes rust-lang#81806
…de, r=nikomatsakis Add checking for no_mangle to unsafe_code lint fixes rust-lang#72188 r? `@estebank`
… r=nikomatsakis Allow Trait inheritance with cycles on associated types take 2 This reverts the revert of rust-lang#79209 and fixes the ICEs that's occasioned by that PR exposing some problems that are addressed in rust-lang#80648 and rust-lang#79811. For easier review I'd say, check only the last commit, the first one is just a revert of the revert of rust-lang#79209 which was already approved. This also could be considered part or the actual fix of rust-lang#79560 but I guess for that to be closed and fixed completely we would need to land rust-lang#80648 and rust-lang#79811 too. r? `@nikomatsakis` cc `@Aaron1011`
…crum Add "every" as a doc alias for "all". This matches [Array#every](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/every) in JavaScript. Oddly enough, `core::iter::Iterator::all` appears twice. This appears to be a rustdoc bug which I decided to fill in as rust-lang#81696. 
Prefer match over combinators to make some Box methods inlineable Hopefully this patch would make two snippets generated identical code: <https://rust.godbolt.org/z/fjrj4E>.
…ers, r=Mark-Simulacrum Resolve typedef in HashMap lldb pretty-printer only if possible Fixes rust-lang#81814 Previously, `GetTypedefedType` was invoked unconditionally. But this did not work in case of `rust-lldb` without Rust patches since there was no typedef.
[rustbuild] Output rustdoc-json-types docs `@rustbot` modify labels +A-rustdoc-json +T-doc +T-rustdoc +A-rustbuild +A-contributor-roadblock
…ark-Simulacrum Expand the docs for ops::ControlFlow a bit Since I was writing some examples for an RFC anyway. And I almost made the mistake of reordering the variants, so added a note and a test about that.
parser: Fix panic in 'const impl' recovery The panic happens when in recovery parsing a full `impl` (`parse_item_impl`) fails and we drop the `DiagnosticBuilder` for the recovery suggestion and return the `parse_item_impl` error. We now raise the original error "expected identifier found `impl`" when parsing the `impl` fails. Note that the regression test is slightly simplified version of the original repro in rust-lang#81806, to make the error output smaller and more resilient to unrelated changes in parser error messages. Fixes rust-lang#81806
…=jonas-schievink ⬆️ rust-analyzer r? `@jonas-schievink`
Fix pretty printer macro_rules with semicolon. The pretty printer was not including the trailing semicolon for a macro_rules definition that used parenthesis or brackets, which results in invalid code. This adds the semicolon in those two cases.
…ulacrum Remove outdated comment in windows' mutex.rs After rust-lang#81250, this `Mutex` no longer falls back to the `ReentrantMutex` implementation, so this comment is no longer relevant.
|
@bors r=Dylan-DPC rollup=never p=11 @Dylan-DPC you forgot to approve again :( |
|
📌 Commit d2e204d has been approved by |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
# 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.
Successful merges:
Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup