Rollup of 6 pull requests #109911
Merged
Rollup of 6 pull requests #109911
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
- Remove unused reference link in CONTRIBUTING.md - Change the contributing_url for triagebot to the getting started page
`UnsafeCell` page could benefit too from having links to these most popular structs in the module.
This solves a regression where `0.0.cmp()` was ambiguous when a custom trait with a `cmp` method was in scope. FOr integers it shouldn't be a problem in practice so I wasn't able to add a test.
…ulacrum Update contributing links for rustc-dev-guide changes Companion PR to rust-lang/rustc-dev-guide#1653. - Remove unused reference link in CONTRIBUTING.md - Change the contributing_url for triagebot to the getting started page
Add links to <cell.rs> `UnsafeCell` page could benefit too from having links to these most popular structs in the module.
Update book, rustc-dev-guide, rust-by-example Changes from `rust-lang/book`: * rust-lang/book#3598 Changes from `rust-lang/rust-by-example`: * rust-lang/rust-by-example#1695 * rust-lang/rust-by-example#1694 * rust-lang/rust-by-example#1693 * rust-lang/rust-by-example#1688 * rust-lang/rust-by-example#1696 Changes from `rust-lang/rustc-dev-guide`: * rust-lang/rustc-dev-guide#1655 * rust-lang/rustc-dev-guide#1657 * rust-lang/rustc-dev-guide#1659 * rust-lang/rustc-dev-guide@d436bf1...fca8af6 r? `@ehuss`
…-remember-this-dear-transmuter, r=compiler-errors Never consider int and float vars for `FnPtr` candidates This solves a regression where `0.0.cmp()` was ambiguous when a custom trait with a `cmp` method was in scope. For integers it shouldn't be a problem in practice so I wasn't able to add a test. I'm not sure whether there could be more issues hidden in the shadows as mentioned in the issue, but this should at least fix the problematic regression immediately. fixes rust-lang#109892 r? oli-obk
…rrors Add async-await test for rust-lang#107414 fixes rust-lang#107414 r? `@cjgillot`
Add Chris Denton to `.mailmap`
rustbot
added
A-meta
|
@bors r+ p=6 rollup=never |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
1 similar comment
|
☀️ Test successful - checks-actions |
|
📌 Perf builds for each rolled up PR:
previous master: cf7ada217c In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
|
📌 Perf builds for each rolled up PR: previous master: 48829ea74b In the case of a perf regression, run the following command for each PR you suspect might be the cause: |
|
Finished benchmarking commit (cf7ada2): 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.
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:
FnPtrcandidates #109896 (Never consider int and float vars forFnPtrcandidates)Broken MIR: generator contains type [&std::option::Option<StructB>] in MIR, but typeck only knows about {ResumeTy, StructB, Option<StructB>, &StructB, impl Future<Output = StructA>, ()} and []#107414).mailmap#109903 (Add Chris Denton to.mailmap)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup