Uh oh!
There was an error while loading. Please reload this page.
Rollup of 7 pull requests - #102479
Closed
matthiaskrgr wants to merge 16 commits into
Closed
Conversation
Fixes a regression caused by 8846c08, where a header's top margin used to be collapsed, but isn't any more.
This line was added in c494a06, because at the time, the headers had these classes on them. Now, the headers are children of the `<section>` with the class on it. This commit also adds a test case, to make sure the srclink font weight does not regress again.
More cleanup for 8846c08, this time in trait layouts when things are collapsed.
After calling libc::fork, the child process tried to access a TLS variable when processing a panic. This caused a memory allocation which is UB in the child. To prevent this from happening, the panic handler will not access the TLS variable in case `panic::always_abort` was called before.
…=cjgillot Fix span of byte-escaped left format args brace Fixrust-lang#102057 (see issue for example). Previously, the use of escaped left braces (`\x7B`) in format args resulted in an incorrectly offset span. This patch fixes that by considering any escaped characters within the string instead of using a constant offset.
… r=jsha rustdoc: cut margin-top from first header in docblock Fixes a regression caused by 8846c08, where a header's top margin used to be collapsed, but isn't any more. ## Before  ## After 
… r=GuillaumeGomez rustdoc: remove bad CSS font-weight on `.impl`, `.method`, etc This line was added in c494a06, because at the time, the headers had these classes on them. Now, the headers are children of the `<section>` with the class on it. This commit also adds a test case, to make sure the srclink font weight does not regress again.
… r=jsha rustdoc: add method spacing to trait methods More cleanup for 8846c08, this time in trait layouts when things are collapsed. This PR makes two changes to the appearance of trait pages: * It adds the `method-toggle` class to method toggles on traits, making the DOM more consistent with type pages (which already have this class). ## Before  ## After  * It adds a bottom margin to docblocks nested directly in the implementors list, giving it a similar appearance to if it was nested within a toggle. ## Before  ## After 
…ter_fork, r=thomcc Prevent UB in child process after calling libc::fork After calling libc::fork, the child process tried to access a TLS variable when processing a panic. This caused a memory allocation which is UB in the child. To prevent this from happening, the panic handler will not access the TLS variable in case `panic::always_abort` was called before. Fixesrust-lang#85261 (not only on Android systems, but also on Linux/QNX with TLS disabled, see issue for more details) Main drawbacks of this fix: * Panic messages can incorrectly omit `core::panic::PanicInfo` struct in case several panics (of multiple threads) occur at the same time. The handler cannot distinguish between multiple panics in different threads or recursive ones in the same thread, but the message will contain a hint about the uncertainty. * `panic_count::increase()` will be a bit slower as it has an additional `if`, but this should be irrelevant as it is only called in case of a panic.
tidy: make rustc dependency error less confusing The current wording leads to very confusing messages: ``` tidy error: Dependencies for main workspace not explicitly permitted: * unicode-ident 1.0.4 (registry+https://github.com/rust-lang/crates.io-index) ``` Miri is part of that workspace, and there never was a problem adding Miri dependencies. The actual error is that due to a crate bump this now showed up as a rustc dependency, and *those* are restricted.
Split out the error reporting logic into a separate function I was trying to read the function and got distracted by the huge block of code in the middle of it. Turns out it only reports diagnostics and all paths within it end in an error. The main function is now more readable imo.
matthiaskrgr
commented
Sep 29, 2022
MemberAuthor
@bors r+ rollup=never p=7 |
bors
commented
Sep 29, 2022
Collaborator
bors
commented
Sep 29, 2022
Collaborator
⌛ Testing commit 959742e with merge 2b99ac32ea914dff6e72005993274e85e1b52ec9... |
bors
commented
Sep 29, 2022
Collaborator
💔 Test failed - checks-actions |
rust-log-analyzer
commented
Sep 29, 2022
Collaborator
The job Click to see the possible cause of the failure (guessed by this bot) |
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 freeto 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:
.impl,.method, etc #102442 (rustdoc: remove bad CSS font-weight on.impl,.method, etc)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup