Rollup of 6 pull requests #102520
Merged
Rollup of 6 pull requests #102520
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
`DefId` uses different field orders on 64-bit big-endian vs. others, in order to optimize its `Hash` implementation. However, that also made it derive different lexical ordering for `PartialOrd` and `Ord`. That caused spurious differences wherever `DefId`s are sorted, like the candidate sources list in `report_method_error`. Now we manually implement `PartialOrd` and `Ord` on 64-bit big-endian to match the same lexical ordering as other targets, fixing at least one test, `src/test/ui/methods/method-ambig-two-traits-cross-crate.rs`.
…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.
… r=fee1-dead Added more const_closure functionality Enables ConstFnMutClosure to use a tuple of mutable references instead of just a mutable reference to a tuple. Removes the new function, since it would barely be usable with this new code. r? `@fee1-dead`
Manually order `DefId` on 64-bit big-endian `DefId` uses different field orders on 64-bit big-endian vs. others, in order to optimize its `Hash` implementation. However, that also made it derive different lexical ordering for `PartialOrd` and `Ord`. That caused spurious differences wherever `DefId`s are sorted, like the candidate sources list in `report_method_error`. Now we manually implement `PartialOrd` and `Ord` on 64-bit big-endian to match the same lexical ordering as other targets, fixing at least one test, `src/test/ui/methods/method-ambig-two-traits-cross-crate.rs`.
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
|
@bors r+ rollup=never p=6 |
bors
added
the
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
|
📌 Perf builds for each rolled up PR: previous master: 75d3027fb5 In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
|
Finished benchmarking commit (877877a): comparison URL. Overall result: no relevant changes - no action needed@rustbot label: -perf-regression Instruction countThis benchmark run did not return any relevant results for this metric. 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:
DefIdon 64-bit big-endian #102382 (Manually orderDefIdon 64-bit big-endian)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