Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rollup of 6 pull requests #110137

Merged
merged 30 commits into from
Apr 10, 2023
Merged

Rollup of 6 pull requests #110137

merged 30 commits into from
Apr 10, 2023

Conversation

Dylan-DPC
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

scottmcm and others added 30 commits April 6, 2023 13:53
No need for us to write the multiplication when `size_of_val` does exactly what we need.
This makes jump-to-definition work in most IDEs, as well as being easier
to understand for contributors.
This pattern is fine for arena allocators.
Nothing was really incorrect before, but it did get nicer.
The shadowing lead to an incorrect comparison. Rename it and compare it
properly. compiler-errors told me that I should just include the fix
here without a test.
Exhaustively destructure and ignore `()`
Co-authored-by: Michael Goulet <[email protected]>
…rors

prioritize param env candidates if they don't guide type inference

intended to supersede rust-lang#109579. We disable the prioritization during coherence to maintain completeness.

Long term we can hopefully replace this hack with adding OR to external constraints at which point the only relevant part when merging responses is whether they guide type inference in the same way.

Reuses `try_merge_responses` for assembly and the cleanest way to impl that was to actually split that so that `try_merge_responses` returns `None` if we fail to merge them and then add `flounder` which is used afterwards which is allowed to lower the certainty of our responses.

If, in the future, we add the ability to merge candidates `YES: ?0 = Vec<u32>` and `YES: ?0 = Vec<i32>` to `AMBIG: ?0 = Vec<?1>`, this should happen in `flounder`.

r? `@compiler-errors` `@BoxyUwU`
…rors

Fix a couple ICEs in the new `CastKind::Transmute` code

Check the sizes of the immediates, rather than the overall types, when deciding whether we can convert types without going through memory.

Fixes rust-lang#110005
Fixes rust-lang#109992
Fixes rust-lang#110032
cc `@matthiaskrgr`
…Denton

Avoid some manual slice length calculation

No need for us to write the multiplication when `size_of_val` does exactly what we need.

(rust-lang/rust-clippy#10601)
…piler-errors

compiletest: Use remap-path-prefix only in CI

This makes jump-to-definition work in most IDEs, as well as being easier to understand for contributors.

Fixes rust-lang#109725. cc `@TimNN`
Fix `x check --stage 1` when download-rustc is enabled

Helps with rust-lang#81930
…-errors

Some clippy fixes in the compiler

Best reviewed commit-by-commit 📎.
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) rollup A PR which is a rollup labels Apr 10, 2023
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Apr 10, 2023

📌 Commit 97921ab has been approved by Dylan-DPC

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Apr 10, 2023
@Dylan-DPC
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Apr 10, 2023

💡 This pull request was already approved, no need to approve it again.

  • There's another pull request that is currently being tested, blocking this pull request: bump few deps #110008

@bors
Copy link
Contributor

bors commented Apr 10, 2023

📌 Commit 97921ab has been approved by Dylan-DPC

It is now in the queue for this repository.

@bors
Copy link
Contributor

bors commented Apr 10, 2023

⌛ Testing commit 97921ab with merge d4be8ef...

@bors
Copy link
Contributor

bors commented Apr 10, 2023

☀️ Test successful - checks-actions
Approved by: Dylan-DPC
Pushing d4be8ef to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 10, 2023
@bors bors merged commit d4be8ef into rust-lang:master Apr 10, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 10, 2023
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Perf Build Sha
#110124 a8ffc61577ced66d15e2374d805cdd7748dc62fd
#110121 164cc05a0dff1888787c9a048930ce65a103775f
#110115 49190a13be583771f150d0b5bb658889f767e477
#110044 01cc5bb583c102d1814fd0defe3c2b37be390790
#110021 3641ba4124ec6e87d9d99e33b2f14f95da0650f0
#109724 63659269113cf3068b6f85f11aacf00af57c9155

previous master: 7f7e8fbc99

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (d4be8ef): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This 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.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.0% [-1.0%, -1.0%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.0% [-1.0%, -1.0%] 1

Cycles

Results

This 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.

mean range count
Regressions ❌
(primary)
0.4% [0.4%, 0.4%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.5% [-0.5%, -0.5%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -0.0% [-0.5%, 0.4%] 2

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-testsuite Area: The testsuite used to check the correctness of rustc A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic merged-by-bors This PR was explicitly merged by bors. 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants