Rollup of 5 pull requests #104351
Merged
Rollup of 5 pull requests #104351
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
This allows people to treat them like real links, such as right-click to copy URL, and makes the line numbers in a scraped example work at all, when before this commit was added, they had the clickable pointer cursor but did not actually do anything when clicked.
It's a link. This is the default CSS for it.
…r=GuillaumeGomez rustdoc: change `.src-line-numbers > span` to `.src-line-numbers > a` Example: https://notriddle.com/notriddle-rustdoc-demos/line-anchors/test_dingus/fn.test.html This allows people to treat them like real links, such as right-click to copy URL, and makes the line numbers in a scraped example work at all, when before this commit was added, they had the clickable pointer cursor but did not actually do anything when clicked.
…it-v2, r=GuillaumeGomez rustdoc: use consistent "popover" styling for notable traits Follow-up to rust-lang#104129 Fixes rust-lang#104313. Preview: https://notriddle.com/notriddle-rustdoc-demos/js-notable-trait-v2/std/iter/trait.Iterator.html#method.step_by ## Before   ## After  
Move tests r? `@petrochenkov` rust-lang#46521 -> enum-discriminant
…ckground, r=GuillaumeGomez
rustdoc: remove no-op CSS `.scrape-help { background: transparent }`
It's a link. This is the default CSS for it.
…compiler-errors Fix up a Fluent message Fix up a Fluent message which contained arrows `->` after [selectors](https://projectfluent.org/fluent/guide/selectors.html). The original author probably thought that they were required as part of the selector syntax but in reality they were interpreted as literal text and actually showed up in the emitted diagnostic. This wasn't caught during the diagnostic migration since the branch constructing the diagnostic in question (`rustc_infer::errors::LifetimeMismatchLabels::Normal`) was not exercised by the UI test suite. I've added two more test cases to do so (one testing `LifetimeMismatchLabels::Normal` where `hir_equal == true` and one where `hir_equal == false`). Diff visualizing the `->` bug (`master` vs `fix-up-a-fluent-message`): ```diff error[E0623]: lifetime mismatch --> src/test/ui/implied-bounds/hrlt-implied-trait-bounds-guard.rs:39:30 | 39 | fn badboi3<'in_, 'out, T>(a: Foo<'in_, 'out, (&'in_ T, &'out T)>, sadness: &'in_ T) { | ^^^^^^^^^^^^^^^^^-------^^-------^^ | | | | | these two types are declared with different lifetimes... - | ...but data-> from `a` flows-> into `a` here + | ...but data from `a` flows into `a` here ```
rustbot
added
A-testsuite
|
@bors p=5 rollup=never r+ |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
📌 Perf builds for each rolled up PR: previous master: 3be81dd0ce In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
|
Finished benchmarking commit (928d14b): comparison URL. Overall result: ❌ regressions - 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. |
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:
.src-line-numbers > spanto.src-line-numbers > a#103650 (rustdoc: change.src-line-numbers > spanto.src-line-numbers > a).scrape-help { background: transparent }#104323 (rustdoc: remove no-op CSS.scrape-help { background: transparent })Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup