Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

jeremystucki and others added 19 commits December 20, 2022 22:10
This renames the ID, which is only used in search results, to
`#search-tabs`. Also changes the `.count` to a span, so it doesn't need its
display mode to be overridden.
The rules `overflow:hidden` and `text-overflow:ellipses` only have an
effect if overflow occurs, which cannot happen because it will just line
wrap instead.

These rules definitely became obsolete by
rust-lang#77699, when the stylesheet was
decidedly changed to have line wrapping in short docblocks, but given the
bug it was fixing, this probably got broken earlier.
…illaumeGomez

docs/test: add UI test and long-form error docs for E0462

Another UI test/ docs combo.

r? ``@GuillaumeGomez``
…-lifetimes, r=eholk

rustc: Remove needless lifetimes
…=GuillaumeGomez

rustdoc: use a more evocative name for CSS/JS `#titles`

This renames the ID, which is only used in search results, to `#search-tabs`. Also changes the `.count` to a span, so it doesn't need its display mode to be overridden.
fix vec::IntoIter::drop on high-alignment ZST

This fixes a soundness bug: IntoIter would call `drop_in_place` on an insufficiently aligned pointer. So if a ZST with alignment greater 1 had drop glue, that would be called with an unaligned reference. Since rust-lang#103957, Miri checks alignment even if the type does not have drop glue, which is how this bug was found.

r? ``@thomcc``
…element, r=notriddle

Use correct CSS pseudo-element selector

Pseudo-element should use "::" to not be confused with pseudo selectors (nice explanation here: https://css-tricks.com/to-double-colon-or-not-do-double-colon/).

r? ``@notriddle``
…-overflow, r=GuillaumeGomez

rustdoc: remove no-op CSS from `.docblock-short`

The rules `overflow:hidden` and `text-overflow:ellipses` only have an effect if overflow occurs, which cannot happen because it will just line wrap instead.

These rules definitely became obsolete by rust-lang#77699, when the stylesheet was decidedly changed to have line wrapping in short docblocks, but given the bug it was fixing, this probably got broken earlier.
@rustbot
Copy link
Collaborator

rustbot commented Dec 23, 2022

Error: Malformed triagebot.toml in default branch.
newline in string found at line 345 column 53

Please file an issue on GitHub at triagebot if there's a problem with this bot, or reach out on #t-infra on Zulip.

@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=7

@bors
Copy link
Collaborator

bors commented Dec 23, 2022

📌 Commit da4be75 has been approved by matthiaskrgr

It is now in the queue for this repository.

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Dec 23, 2022
@bors
Copy link
Collaborator

bors commented Dec 24, 2022

⌛ Testing commit da4be75 with merge 6c0c6d6...

@bors
Copy link
Collaborator

bors commented Dec 24, 2022

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 6c0c6d6 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 24, 2022
@bors bors merged commit 6c0c6d6 into rust-lang:master Dec 24, 2022
@rustbot rustbot added this to the 1.68.0 milestone Dec 24, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (6c0c6d6): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-0.6% [-0.6%, -0.6%] 1
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results

This 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.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-5.1% [-5.1%, -5.1%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -5.1% [-5.1%, -5.1%] 1

Cycles

This benchmark run did not return any relevant results for this metric.

Aaron1011 pushed a commit to Aaron1011/rust that referenced this pull request Jan 6, 2023
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#105970 (docs/test: add UI test and long-form error docs for E0462)
 - rust-lang#105975 (rustc: Remove needless lifetimes)
 - rust-lang#106069 (rustdoc: use a more evocative name for CSS/JS `#titles`)
 - rust-lang#106084 (fix vec::IntoIter::drop on high-alignment ZST)
 - rust-lang#106091 (Use correct CSS pseudo-element selector)
 - rust-lang#106093 (rustdoc: remove no-op CSS from `.docblock-short`)
 - rust-lang#106102 (Fix `triagebot.toml`)

Failed merges:

 - rust-lang#106028 (docs/test: add UI test and long-form error docs for `E0461`)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr deleted the rollup-8xe9ddz branch March 16, 2024 18:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants