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 4 pull requests #124388

Merged
merged 8 commits into from
Apr 26, 2024
Merged

Conversation

compiler-errors
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

NobodyXu and others added 8 commits April 18, 2024 00:07
Keep the LIB env var in the compiler-builtins test

The `tests/run-make/compiler-builtins` test was failing for me with Visual Studio 2022, complaining that it couldn't find `kernel32.lib`.

For whatever reason, with VS 2022 we need to keep the `LIB` environment variable when invoking Cargo so that the linker can find the Windows SDK libs.
…lookup-behavior, r=lcnr

Remove special-casing for `SimplifiedType` for next solver

It's unnecessary due to the way that we fully normalize the self type before assembly begins.

r? lcnr
…lcnr

Renamed `DerivedObligation` to `WellFormedDeriveObligation`

It's used when computing `WellFormed` obligations, so let's give it a less ambiguous name.
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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 26, 2024
@compiler-errors
Copy link
Member Author

@bors r+ rollup=never p=4

@bors
Copy link
Contributor

bors commented Apr 26, 2024

📌 Commit 88eae31 has been approved by compiler-errors

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

bors commented Apr 26, 2024

⌛ Testing commit 88eae31 with merge e59f2c5...

@bors
Copy link
Contributor

bors commented Apr 26, 2024

☀️ Test successful - checks-actions
Approved by: compiler-errors
Pushing e59f2c5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Apr 26, 2024
@bors bors merged commit e59f2c5 into rust-lang:master Apr 26, 2024
11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Apr 26, 2024
@rust-timer
Copy link
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#124076 Stablise io_error_downcast 391050edeb03b361a85173366759089405107e46 (link)
#124378 Keep the LIB env var in the compiler-builtins test 0a7978e8a9c453a667a0b99be83d0e9ff0bff3ac (link)
#124379 Remove special-casing for SimplifiedType for next solver 32e31b2bd218760931852cd0b5a09f47b8ab4ee0 (link)
#124381 Renamed DerivedObligation to WellFormedDeriveObligation 364cfdbdb4d9395e4fa352341f2c894f8786c66a (link)

previous master: 3a36386dc1

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 (e59f2c5): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.2% [-2.1%, -0.2%] 2
All ❌✅ (primary) - - 0

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.645s -> 670.868s (-0.12%)
Artifact size: 315.99 MiB -> 316.00 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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-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.

6 participants