Rollup of 8 pull requests#83843
Closed
GuillaumeGomez wants to merge 19 commits intorust-lang:masterfrom
Closed
Conversation
This allows keeping the setting to a fixed value without having to toggle it when you want to work on the compiler instead of on tools.
Recent FreeBSD gdb packages have a different format for the version string.
Instead of producing `<span class=macro>assert_eq</span><span class=macro>!</span>`, just produce `<span class=macro>assert_eq!</span>`.
Co-authored-by: Ralf Jung <post@ralfj.de>
…-Simulacrum BTree: move blocks around in node.rs Without changing any names or implementation, reorder some members: - Move down the ones once defined on the demised `struct Root`, to below the definition of their current host `struct NodeRef`. - Move up some defined on `struct NodeRef` that are interspersed with those defined on `struct Handle`. - Move up the `correct_…` methods squeezed between the two flavours of `push`. - Move the unchecked static downcasts (`cast_to_…`) after the upcasts (`forget_`) and the (weirdly named) dynamic downcasts (`force`). r? `@Mark-Simulacrum`
…k-Simulacrum Add `download-rustc = "if-unchanged"` This allows keeping the setting to a fixed value without having to toggle it when you want to work on the compiler instead of on tools. This sets `BOOTSTRAP_DOWNLOAD_RUSTC` in bootstrap.py so rustbuild doesn't have to try and replicate its logic. Helps with rust-lang#81930. r? `@Mark-Simulacrum` cc `@camelid`
…check, r=Mark-Simulacrum Fix error codes check run and ensure it will not go unnoticed again Fixes rust-lang#83268. The error codes explanations were not checked anymore. I fixed this issue and also added variables to ensure that this won't happen again (at least not silently).
Fix compiletest on FreeBSD Recent FreeBSD gdb packages have a different format for the version string.
…ht, r=GuillaumeGomez rustdoc: highlight macros more efficiently Instead of producing `<span class=macro>assert_eq</span><span class=macro>!</span>`, just produce `<span class=macro>assert_eq!</span>`.
…r=camelid Remove unneeded INITIAL_IDS const Some IDs inside this map didn't exist anymore, some others were duplicates of what we have inside `IdMap`. So instead of keeping the two around and since `INITIAL_IDS` was only used by `IdMap`, no need to keep both of them.
…order-shuffle, r=jyn514 List trait impls before deref methods in doc's sidebar This PR is acting directly on a suggestion made by `@jyn514` in rust-lang#83133. I've tested the changes locally, and can confirm that it does in fact properly achieve what he thought it would. This PR also in turn closes rust-lang#83133.
…r=RalfJung cleanup leak after test to make miri happy Contains changes that were requested in rust-lang#83629 but didn't make it into the rollup. r? `@RalfJung`
Member
Author
|
@bors: r+ p=8 |
Collaborator
|
📌 Commit bd77c13 has been approved by |
bors
added
the
S-waiting-on-bors
Collaborator
|
🔒 Merge conflict This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again. How do I rebase?Assuming
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial. Please avoid the "Resolve conflicts" button on GitHub. It uses Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message |
bors
added
S-waiting-on-author
Collaborator
|
☔ The latest upstream changes (presumably #82347) made this pull request unmergeable. Please resolve the merge conflicts. |
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
9 participants
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:
download-rustc = "if-unchanged"#83368 (Adddownload-rustc = "if-unchanged")Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup