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 9 pull requests #126528

Merged
merged 21 commits into from
Jun 15, 2024
Merged

Rollup of 9 pull requests #126528

merged 21 commits into from
Jun 15, 2024

Conversation

GuillaumeGomez
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

ChrisDenton and others added 21 commits June 10, 2024 13:51
Mainly so that it is easier to only run all `non-snake-case`-specific
tests but no other tests with:

    ./x test tests/ui/lint/non-snake-case

But also to reduce the size of the large `tests/ui/lint` directory. And
rename some tests to pass tidy, and remove them from
`src/tools/tidy/src/issues.txt`.
…crum

Bump windows-bindgen to 0.57

This PR updates our generated Windows API bindings using the latest version of `windows-bindgen`.

The only change to the generated code is that `derive` is used for `Copy` and `Clone` instead of `impl`.
…, r=lcnr

Check that alias-relate terms are WF if reporting an error in alias-relate

Check that each of the left/right term is WF when deriving a best error obligation for an alias-relate goal. This will make sure that given `<i32 as NotImplemented>::Assoc = ()` will drill down into `i32: NotImplemented` since we currently treat the projection as rigid.

r? lcnr
…-obk

smir: merge identical Constant and ConstOperand types

The first commit renames the const operand visitor functions on regular MIR to match the type name, that was forgotten in the original rename.

The second commit changes stable MIR, fixing rust-lang/project-stable-mir#71. Previously there were two different smir types for the MIR type `ConstOperand`, one used in `Operand` and one in `VarDebugInfoContents`.

Maybe we should have done this with rust-lang#125967, so there's only a single breaking change... but I saw that PR too late.

Fixes rust-lang/project-stable-mir#71
…degen-options-parsing, r=jieyouxu

Migrate `run-make/codegen-options-parsing` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`
Make proof tree probing and `Candidate`/`CandidateSource` generic over interner

`<TyCtxt<'tcx>>` is ugly, but will become `<I>` when things actually become generic.

r? lcnr
…pick, r=compiler-errors

Make uninitialized_error_reported a set of locals

Another artifact of how places used to be able to be based on statics and not just locals. This set is exclusively filled with PlaceRefs that are just locals, so it should just contain locals directly.
…p-graph, r=Kobzol

Migrate `run-make/dep-graph` to `rmake.rs`

Part of rust-lang#121876.

r? `@jieyouxu`
…-errors

trait_selection: remove extra words

Tiny doc cleanup.

Fixes rust-lang#88231.
tests/ui/lint: Move 19 tests to new `non-snake-case` subdir

Mainly so that it is easier to only run all `non_snake_case`-lint-specific tests with:

    ./x test tests/ui/lint/non-snake-case

But also to reduce the size of the large `tests/ui/lint` directory. And rename some tests to pass tidy, and remove them from `src/tools/tidy/src/issues.txt`.
@rustbot rustbot added A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc O-windows Operating system: Windows 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 rollup A PR which is a rollup labels Jun 15, 2024
@GuillaumeGomez
Copy link
Member Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jun 15, 2024

📌 Commit f788ea4 has been approved by GuillaumeGomez

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 Jun 15, 2024
@bors
Copy link
Contributor

bors commented Jun 15, 2024

⌛ Testing commit f788ea4 with merge 3cf924b...

@bors
Copy link
Contributor

bors commented Jun 15, 2024

☀️ Test successful - checks-actions
Approved by: GuillaumeGomez
Pushing 3cf924b to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 15, 2024
@bors bors merged commit 3cf924b into rust-lang:master Jun 15, 2024
7 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 15, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#126229 Bump windows-bindgen to 0.57 18aa9744e77310b99b38c5fb5ca8049c2299f6b0 (link)
#126404 Check that alias-relate terms are WF if reporting an error … 279559759d0e2776eaca13497ff503f25eee5b18 (link)
#126410 smir: merge identical Constant and ConstOperand types 0c9486c37cfd52af987aebd4f235e92f5a2db391 (link)
#126478 Migrate run-make/codegen-options-parsing to rmake.rs c68a5d621b5227508681ba19f6b033db6312cb33 (link)
#126496 Make proof tree probing and Candidate/CandidateSource g… e0e05c69771444fb8301c1482781607831c81dbb (link)
#126508 Make uninitialized_error_reported a set of locals ca513cb6fb1af3c8fb6d50cdfad753afd963e6bc (link)
#126517 Migrate run-make/dep-graph to rmake.rs 050f0ffe689293cfec3b76d1bbc07c1f7a8f98cc (link)
#126525 trait_selection: remove extra words c3b28962f5b6912b8d26ba8f97ec46a80dd1654e (link)
#126526 tests/ui/lint: Move 19 tests to new non-snake-case subdir 57420db4ea3db56de6ac5cfa91ed6b65beb5d05f (link)

previous master: 92af831290

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 (3cf924b): 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)

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

Cycles

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

Binary size

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

Bootstrap: 671.284s -> 669.839s (-0.22%)
Artifact size: 320.38 MiB -> 320.39 MiB (0.00%)

@GuillaumeGomez GuillaumeGomez deleted the rollup-6zjs70e branch June 16, 2024 09:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-run-make Area: port run-make Makefiles to rmake.rs A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. O-windows Operating system: Windows 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
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

10 participants