Rollup of 4 pull requests #101396
Merged
Rollup of 4 pull requests #101396
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
Added in 34bd2b8 For this to actually do anything, [according to MDN] (and Firefox Dev Tools), it must be a "flex item", which only happens if its a direct child of a node with `display: flex` on it. It seems like it could not have worked at the time when this rule was added, because the only items in `rustdoc.css` with `display: flex` active were: * `#help` This should not contain anything like this. * `.impl-items h4, h4.impl, h3.impl` These are all headers, so they shouldn't contain `.impl-items` either. * `.content .impl-items .method, .content .impl-items > .type, .impl-items > .associatedconstant` Associated constants and methods definitely shouldn't contain a list of impl items, and the `.type` class seems to refer to type aliases, which, when shown inside of an impl, only show a link to the aliased type. [according to MDN]: https://developer.mozilla.org/en-US/docs/Web/CSS/flex-basis Nowadays, `display: flex` is a lot more prolific, but `.impl-items` still seems to only be used in plain block parents: * If it's not a trait impl, then it's nested below a `<div>` with an id but no class, added in a5216cf. This will be `display: block`, probably. For example, [vec deref] * Inherent impls also get a `<div>` tag, for example [vec impl], and they are also wrapped by their own non-flexbox `<details>` tag. * If it's a tait implementation, then it's also nested below a `<details>` container, like [deref cstring]. [vec impl]: https://doc.rust-lang.org/1.63.0/std/vec/struct.Vec.html#impl [vec deref]: https://doc.rust-lang.org/1.63.0/std/vec/struct.Vec.html#deref-methods-%5BT%5D [deref cstring]: https://doc.rust-lang.org/1.63.0/std/ops/trait.Deref.html#impl-Deref Also, this would imply that trait items ought to take up as much space as possible, pushing everything else to the edge of the screen. If this is nested directly below the `.rustdoc` container, which has a row basis, that would be bad.
…, r=jackh726 Suggest associated method on deref types when path syntax method fails Fixes rust-lang#100278
Make trait bound not satisfied specify kind Closes rust-lang#99875
…GuillaumeGomez
rustdoc: remove `.impl-items { flex-basis }` CSS, not in flex container
Added in 34bd2b8
For this to actually do anything, [according to MDN] (and Firefox Dev Tools), it must be a "flex item", which only happens if its a direct child of a node with `display: flex` on it. It seems like it could not have worked at the time when this rule was added, because the only items in `rustdoc.css` with `display: flex` active were:
* `#help`
This should not contain anything like this.
* `.impl-items h4, h4.impl, h3.impl`
These are all headers, so they shouldn't contain `.impl-items` either.
* `.content .impl-items .method, .content .impl-items > .type, .impl-items > .associatedconstant`
Associated constants and methods definitely shouldn't contain a list of impl items, and the `.type` class seems to refer to type aliases, which, when shown inside of an impl, only show a link to the aliased type.
[according to MDN]: https://developer.mozilla.org/en-US/docs/Web/CSS/flex-basis
Nowadays, `display: flex` is a lot more prolific, but `.impl-items` still seems to only be used in plain block parents:
* If it's not a trait impl, then it's nested below a `<div>` with an id but no class, added in a5216cf. This will be `display: block`, probably. For example, [vec deref]
* Inherent impls also get a `<div>` tag, for example [vec impl], and they are also wrapped by their own non-flexbox `<details>` tag.
* If it's a tait implementation, then it's also nested below a `<details>` container, like [deref cstring].
[vec impl]: https://doc.rust-lang.org/1.63.0/std/vec/struct.Vec.html#impl
[vec deref]: https://doc.rust-lang.org/1.63.0/std/vec/struct.Vec.html#deref-methods-%5BT%5D
[deref cstring]: https://doc.rust-lang.org/1.63.0/std/ops/trait.Deref.html#impl-Deref
Also, this would imply that trait items ought to take up as much space as possible, pushing everything else to the edge of the screen. If this is nested directly below the `.rustdoc` container, which has a row basis, that would be bad.
… r=jackh726 Fix `global_asm` macro pretty printing Fixes rust-lang#101051 Fixes rust-lang#101047
rustbot
added
T-compiler
|
@bors r+rollup=never p=4 |
|
@bors r+ rollup=never p=4 |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
📌 Perf builds for each rolled up PR: previous master: 84f0c3f79a In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
|
Finished benchmarking commit (5fecdb7): comparison URL. Overall result: ❌✅ regressions and 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.
CyclesResultsThis 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.
Footnotes |
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:
.impl-items { flex-basis }CSS, not in flex container #101349 (rustdoc: remove.impl-items { flex-basis }CSS, not in flex container)global_asmmacro pretty printing #101369 (Fixglobal_asmmacro pretty printing)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup