Skip to content

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Yiming Lei and others added 8 commits September 29, 2022 14:24
…nostic information

	modified:   compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
	new file:   src/test/ui/type/issue-101866.rs
	new file:   src/test/ui/type/issue-101866.stderr
It was disabled in rust-lang#94075 for stage 1 because that PR changed type
layouts such that the results for this test were different for stage 1
and stage 2. But now that rust-lang#94075 is in beta, the results for this test
are now the same for stage 1 and stage 2.
…m: none }`

This rule, added in 69df43b to override the
default `h4` style, has been obsoleted when
a65c98f changed it so that only the top
docblock put `border-bottom` on `h4.`
remove the unused :: between trait and type to give user correct diag…

…nostic information

	modified:   compiler/rustc_trait_selection/src/traits/error_reporting/mod.rs
	new file:   src/test/ui/type/issue-101866.rs
	new file:   src/test/ui/type/issue-101866.stderr
…=lqd

Reinstate `hir-stats.rs` test for stage 1.

It was disabled in rust-lang#94075 for stage 1 because that PR changed type layouts such that the results for this test were different for stage 1 and stage 2. But now that rust-lang#94075 is in beta, the results for this test are now the same for stage 1 and stage 2.

r? ``@lqd``
…umeGomez

rustdoc: remove no-op CSS `h3.variant, .sub-variant h4 { border-bottom: none }`

This rule, added in 69df43b to override the default `h4` style, has been obsoleted when a65c98f changed it so that only the top docblock put `border-bottom` on `h4.`
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Sep 30, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Collaborator

bors commented Sep 30, 2022

📌 Commit c7fe64a 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 Sep 30, 2022
@matthiaskrgr matthiaskrgr deleted the rollup-csqc31s branch October 9, 2022 00:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants