Uh oh!
There was an error while loading. Please reload this page.
Rollup of 7 pull requests - #102482
Merged
Merged
Conversation
Since rust-lang#72889, the Rust wasm target doesn't use --passive-segments, so remove the `--export=__wasm_init_memory`. As documented in the [tool-conventions Linking convention], `__wasm_init_memory` is not intended to be exported. [tool-conventions Linking convention]: https://github.com/WebAssembly/tool-conventions/blob/7c064f304858f67ebf22964a84b7e9658e29557a/Linking.md#shared-memory-and-passive-segments
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.
…=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.
…it-memory, r=nagisa Don't export `__wasm_init_memory` on WebAssembly. Since rust-lang#72889, the Rust wasm target doesn't use --passive-segments, so remove the `--export=__wasm_init_memory`. As documented in the [tool-conventions Linking convention], `__wasm_init_memory` is not intended to be exported. [tool-conventions Linking convention]: https://github.com/WebAssembly/tool-conventions/blob/7c064f304858f67ebf22964a84b7e9658e29557a/Linking.md#shared-memory-and-passive-segments
… 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 
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.
notriddle
commented
Sep 29, 2022
ContributorAuthor
@bors r+ p=7 rollup=never |
bors
commented
Sep 29, 2022
Collaborator
bors
commented
Sep 29, 2022
Collaborator
bors
commented
Sep 29, 2022
Collaborator
☀️ Test successful - checks-actions |
rust-timer
commented
Sep 29, 2022
Collaborator
📌 Perf builds for each rolled up PR: previous master: 9f1a21ae2b In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
rust-timer
commented
Sep 30, 2022
Collaborator
Finished benchmarking commit (9c56d9d): comparison URL. Overall result: ✅ improvements - no action needed@rustbot label: -perf-regression Instruction countThis is a highly reliable metric that was used to determine the overall result at the top of this comment.
Max RSS (memory usage)ResultsThis is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.
CyclesThis benchmark run did not return any relevant results for this metric. Footnotes |
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
8 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:
__wasm_init_memoryon WebAssembly. #102426 (Don't export__wasm_init_memoryon WebAssembly.).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