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 #127111

Merged
merged 42 commits into from
Jun 29, 2024
Merged

Rollup of 9 pull requests #127111

merged 42 commits into from
Jun 29, 2024

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Nadrieril and others added 30 commits June 19, 2024 23:31
This commit was obtained by repeatedly inlining and simplifying.
This commit too was obtained by repeatedly inlining and simplifying.
Currently, `std` performs an atomic load to get the OS key on every access to `StaticKey` even when the key is already known. This PR thus replaces `StaticKey` with the platform-specific `get` and `set` function and a new `LazyKey` type that acts as a `LazyLock<Key>`, allowing the reuse of the retreived key for multiple accesses.
Instead of keeping a list of architectures which have native support
for 64-bit atomics, just use #[cfg(target_has_atomic = "64")] and its
inverted counterpart to determine whether we need to use portable
AtomicU64 on the target architecture.
This will make it easier to migrate existing commands to bootstrap command.
By allowing `run` to receive all of `BootstrapCmd`, `&mut BootstrapCmd`, `Command` and `&mut Command`.
This includes the quality-of-life improvements for developers in
https://fxrev.dev/1061894.
This should no longer be required to build Fuchsia.
This better reflects what the builder actually does.
remove redundant match statement from dataflow const prop
…Kobzol

Rename fuchsia builder and bump Fuchsia

This PR renames the fuchsia builder as requested in rust-lang/rustc-dev-guide#1989 (review) and bumps Fuchsia.

This includes the quality-of-life improvements for developers in https://fxrev.dev/1061894. It also removes the wasm target, which should speed up the build a little.

The new name of the builder is `x86_64-fuchsia` because I think `x86_64-gnu-fuchsia` would be confusing and put too much emphasis on the host target. (In terms of triples, we are targeting `x86_64-unknown-fuchsia` from `x86_64-unknown-linux-gnu`.) Someone on the infra team should weigh in here.

After this lands, we should update the docs in the rustc-dev-guide again.

cc `@lqd`
r? t-infra

try-job: x86_64-fuchsia
…d-parsing, r=fmease

Move binder and polarity parsing into `parse_generic_ty_bound`

Let's pull out the parts of rust-lang#127054 which just:
1. Make the parsing code less confusing
2. Fix `?use<>` (to correctly be denied)
3. Improve `T: for<'a> 'a` diagnostics

This should have no user-facing effects on stable parsing.

r? fmease
unify `dylib` and `bin_helpers` and create `shared_helpers::parse_value_from_args`

`dylib` and `bin_helpers` were already used in similar logic. This PR unifies them under a `shared_helpers` module that is utilized by both the bootstrap library and shims. Additionally, created `parse_value_from_args` with a unit test.  This helps avoid code duplication in shims and can also be used in the bootstrap library if needed (which is the case in one of `@Kobzol's` tasks).

r? `@Kobzol`
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure 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. T-rustdoc Relevant to the rustdoc 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 Jun 29, 2024
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=9

@bors
Copy link
Contributor

bors commented Jun 29, 2024

📌 Commit 8fe7701 has been approved by matthiaskrgr

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

bors commented Jun 29, 2024

⌛ Testing commit 8fe7701 with merge be99243...

@bors
Copy link
Contributor

bors commented Jun 29, 2024

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing be99243 to master...

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#126822 Bootstrap command refactoring: port more Command usages t… 6f8d5244d7e1eeeed90f0d58169b390067d899d5 (link)
#126835 Simplifications in match lowering 62317e08591d5644c1d85e5de0083af0dc1ddca3 (link)
#126953 std: separate TLS key creation from TLS access 79f66fd60583bbea3e13369cf3ad2b08d08ac754 (link)
#127045 Rename super_predicates_of and similar queries to `explic… dc8c556b3ae9bf2487bdb78dc327ee0853757abb (link)
#127075 rustc_data_structures: Explicitly check for 64-bit atomics … a6e4da02427525278ae83bf41c7e89ed0350e5dd (link)
#127101 remove redundant match statement from dataflow const prop a017e861c7a357d3d2d76b23d929db1d4fddd457 (link)
#127102 Rename fuchsia builder and bump Fuchsia 0b9558ba040d4feb0f25727ea99cb3156fb581ba (link)
#127103 Move binder and polarity parsing into `parse_generic_ty_bou… 1bf24565bbc5a265d8016b9d0c5cb1782a689afb (link)
#127108 unify dylib and bin_helpers and create `shared_helpers:… 349327687304ff8c636ba219cee5623fb4e095ed (link)

previous master: 38d0f87a49

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 (be99243): 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 (secondary -3.2%)

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)
- - 0
Improvements ✅
(secondary)
-3.2% [-3.2%, -3.2%] 1
All ❌✅ (primary) - - 0

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: 693.672s -> 699.052s (0.78%)
Artifact size: 324.46 MiB -> 324.44 MiB (-0.01%)

@matthiaskrgr matthiaskrgr deleted the rollup-ybzkuuv branch September 1, 2024 17:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-testsuite Area: The testsuite used to check the correctness of rustc 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-infra Relevant to the infrastructure 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. T-rustdoc Relevant to the rustdoc 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.