Rollup of 12 pull requests #85328
Merged
Rollup of 12 pull requests #85328
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
missing space in "rootseparator"
Signed-off-by: Ian Jackson <[email protected]>
The coverage body_span doesn't always match the function body_span.
Some code cleanup extracted from future (but unfinished) commit to fix coverage in attr macro functions.
I ran into an error trying to fix dead block coverage and realized the `coverageinfo` query is getting a different MIR compared to the codegenned MIR, which can sometimes be a problem during mapgen. I changed that query to use the `InstandeDef` (which includes the generic parameter substitutions, prosibly specific to const params) instead of the `DefId` (without unknown/default const substitutions).
When having the order ``` foo.bar(); // we can now use this method since i32 implements the Foo trait [...] impl Foo for i32 ``` the `// we can now use this method` comment is less clear to me.
Co-authored-by: Josh Triplett <[email protected]>
…meGomez rustdoc: Remove unnecessary `StripItem` wrapper
…efids, r=jyn514,GuillaumeGomez Minimize amount of fake `DefId`s used in rustdoc Follow up from rust-lang#84707, which minimizes the amount of fake defids to the smallest amount possible. Every `FakeDefId` that is now used in the rustdoc library must be preserved and can not be replaced with a normal `DefId`.
…ennytm Fix typo in comment missing space in "rootseparator"
…ks, r=tmandry coverage bug fixes and some refactoring This replaces the relevant commits (2 and 3) from PR rust-lang#85082, and also corrects an error querying for coverageinfo. 1. `coverageinfo` query needs to use the same MIR as codegen I ran into an error trying to fix dead block coverage and realized the `coverageinfo` query is getting a different MIR compared to the codegenned MIR, which can sometimes be a problem during mapgen. I changed that query to use the `InstandeDef` (which includes the generic parameter substitutions, prosibly specific to const params) instead of the `DefId` (without unknown/default const substitutions). 2. Simplified body_span and filtered span code Some code cleanup extracted from future (but unfinished) commit to fix coverage in attr macro functions. 3. Spanview needs the relevant body_span used for coverage The coverage body_span doesn't always match the function body_span. r? ```@tmandry```
…iplett dbg macro: Discuss use in tests, and slightly clarify As discussed in a tangent in rust-lang#82778. I chose to use [semantic newlines](https://rhodesmill.org/brandon/2012/one-sentence-per-line/) in the source text but I don't mind reformatting it.
…=petrochenkov Miner code formatting
swap function order for better read flow I was reading this error message for the first time. I was a little bit confused when reading that part: ``` foo.bar(); // we can now use this method since i32 implements the Foo trait ``` At the time I was reading `// we can now use this method` I wasn't sure why. It only made sense when reading on. So swapping these parts results in a better read flow.
…play, r=notriddle Fix display for "implementors" section Just saw this problem when going through docs:  This fix puts it back to normal:  You can see it on the `TryFrom` page for example. r? ```@Nemo157```
Use my real name
…=jackh726 Improve match statements
…mobile, r=jsha Fix toggle position on mobile Before:   After:   r? ```@jsha```
…=jsha Fix eslint errors I cherry-picked the two non-CI commits from rust-lang#85285. r? ```@jsha```
|
Let's hope this one will be working... @bors: r+ p=12 rollup=never |
|
📌 Commit 46bc552 has been approved by |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
This was referenced May 15, 2021
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:
StripItemwrapper #84461 (rustdoc: Remove unnecessaryStripItemwrapper)DefIds used in rustdoc #85067 (Minimize amount of fakeDefIds used in rustdoc)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup