Rollup of 4 pull requests#102516
Closed
matthiaskrgr wants to merge 8 commits intorust-lang:masterfrom
Closed
Conversation
…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.
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``
Specify `DynKind::Dyn` ref: rust-lang#101212 (comment)
rustbot
added
T-compiler
Member
Author
|
@bors r+ rollup=never p=4 |
Collaborator
bors
added
the
S-waiting-on-bors
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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:
hir-stats.rstest for stage 1. #102495 (Reinstatehir-stats.rstest for stage 1.)h3.variant, .sub-variant h4 { border-bottom: none }#102505 (rustdoc: remove no-op CSSh3.variant, .sub-variant h4 { border-bottom: none })DynKind::Dyn#102506 (SpecifyDynKind::Dyn)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup