Skip to content

A few cleanups after the removal of cfg(not(parallel))#137922

Merged
bors merged 3 commits intorust-lang:masterfrom
Zalathar:sharded
Mar 4, 2025
Merged

A few cleanups after the removal of cfg(not(parallel))#137922
bors merged 3 commits intorust-lang:masterfrom
Zalathar:sharded

Conversation

@Zalathar
Copy link
Member

@Zalathar Zalathar commented Mar 3, 2025

I noticed a few small things that are no longer needed after the removal of cfg(not(parallel)) in #132282.

One of the later changes adjusts several imports, so viewing the changes individually is recommended.

r? SparrowLii (or reroll)

@Zalathar
Remove leading underscores from parameter names in Sharded
5afd122 
With the removal of `cfg(parallel_compiler)`, these parameters are never
considered unused.
@rustbot rustbot added A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-rustc-dev-guide Area: rustc-dev-guide 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. labels Mar 3, 2025
@rustbot
Copy link
Collaborator

rustbot commented Mar 3, 2025

The rustc-dev-guide subtree was changed. If this PR only touches the dev guide consider submitting a PR directly to rust-lang/rustc-dev-guide otherwise thank you for updating the dev guide with your changes.

cc @BoxyUwU, @jieyouxu, @Kobzol

SparrowLii
SparrowLii approved these changes Mar 3, 2025
View reviewed changes
Copy link
Member

@SparrowLii SparrowLii left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the nice work!

SparrowLii
SparrowLii reviewed Mar 3, 2025
View reviewed changes
Copy link
Member

@SparrowLii SparrowLii left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you squash the commits? Since they are all cleaning works and have no side effects

Zalathar added 2 commits March 3, 2025 20:20
@Zalathar
Remove some unnecessary aliases from rustc_data_structures::sync
32c5449 
With the removal of `cfg(parallel_compiler)`, these are always shared
references and `std::sync::OnceLock`.
@Zalathar
Tidy imports in rustc_data_structures::sync
cfa27fb
@rustbot
Copy link
Collaborator

rustbot commented Mar 3, 2025

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

@Zalathar
Copy link
Member Author

Zalathar commented Mar 3, 2025

I have squished as much as possible without losing crucial information. Squashing any more would make the history needlessly confusing.

I also noticed that Clippy needed to be adjusted, and that the OnceLock alias was accidentally re-introduced by a later patch (diff).

@SparrowLii
Copy link
Member

SparrowLii commented Mar 3, 2025

Thanks!
@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Mar 3, 2025

📌 Commit cfa27fb has been approved by SparrowLii

It is now in the queue for this repository.

@bors
Copy link
Collaborator

bors commented Mar 3, 2025

🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened.

@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 Mar 3, 2025
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 3, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 4, 2025
@bors
Auto merge of rust-lang#137959 - matthiaskrgr:rollup-62vjvwr, r=matth…
fd17dea 
…iaskrgr

Rollup of 12 pull requests

Successful merges:

 - rust-lang#135767 (Future incompatibility warning `unsupported_fn_ptr_calling_conventions`: Also warn in dependencies)
 - rust-lang#137852 (Remove layouting dead code for non-array SIMD types.)
 - rust-lang#137863 (Fix pretty printing of unsafe binders)
 - rust-lang#137882 (do not build additional stage on compiler paths)
 - rust-lang#137894 (Revert "store ScalarPair via memset when one side is undef and the other side can be memset")
 - rust-lang#137902 (Make `ast::TokenKind` more like `lexer::TokenKind`)
 - rust-lang#137921 (Subtree update of `rust-analyzer`)
 - rust-lang#137922 (A few cleanups after the removal of `cfg(not(parallel))`)
 - rust-lang#137939 (fix order on shl impl)
 - rust-lang#137946 (Fix docker run-local docs)
 - rust-lang#137955 (Always allow rustdoc-json tests to contain long lines)
 - rust-lang#137958 (triagebot.toml: Don't label `test/rustdoc-json` as A-rustdoc-search)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 795af36 into rust-lang:master Mar 4, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Mar 4, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 4, 2025
@rust-timer
Unrolled build for rust-lang#137922
f746ea2 
Rollup merge of rust-lang#137922 - Zalathar:sharded, r=SparrowLii

A few cleanups after the removal of `cfg(not(parallel))`

I noticed a few small things that are no longer needed after the removal of `cfg(not(parallel))` in rust-lang#132282.

One of the later changes adjusts several imports, so viewing the changes individually is recommended.

r? SparrowLii (or reroll)
@Zalathar Zalathar deleted the sharded branch March 4, 2025 06:01
github-actions bot pushed a commit to model-checking/verify-rust-std that referenced this pull request Mar 14, 2025
@bors
Auto merge of rust-lang#137959 - matthiaskrgr:rollup-62vjvwr, r=matth…
fc90fca 
…iaskrgr

Rollup of 12 pull requests

Successful merges:

 - rust-lang#135767 (Future incompatibility warning `unsupported_fn_ptr_calling_conventions`: Also warn in dependencies)
 - rust-lang#137852 (Remove layouting dead code for non-array SIMD types.)
 - rust-lang#137863 (Fix pretty printing of unsafe binders)
 - rust-lang#137882 (do not build additional stage on compiler paths)
 - rust-lang#137894 (Revert "store ScalarPair via memset when one side is undef and the other side can be memset")
 - rust-lang#137902 (Make `ast::TokenKind` more like `lexer::TokenKind`)
 - rust-lang#137921 (Subtree update of `rust-analyzer`)
 - rust-lang#137922 (A few cleanups after the removal of `cfg(not(parallel))`)
 - rust-lang#137939 (fix order on shl impl)
 - rust-lang#137946 (Fix docker run-local docs)
 - rust-lang#137955 (Always allow rustdoc-json tests to contain long lines)
 - rust-lang#137958 (triagebot.toml: Don't label `test/rustdoc-json` as A-rustdoc-search)

r? `@ghost`
`@rustbot` modify labels: rollup
flip1995 pushed a commit to flip1995/rust that referenced this pull request Mar 20, 2025
@bors
Auto merge of rust-lang#137959 - matthiaskrgr:rollup-62vjvwr, r=matth…
1f0d057 
…iaskrgr

Rollup of 12 pull requests

Successful merges:

 - rust-lang#135767 (Future incompatibility warning `unsupported_fn_ptr_calling_conventions`: Also warn in dependencies)
 - rust-lang#137852 (Remove layouting dead code for non-array SIMD types.)
 - rust-lang#137863 (Fix pretty printing of unsafe binders)
 - rust-lang#137882 (do not build additional stage on compiler paths)
 - rust-lang#137894 (Revert "store ScalarPair via memset when one side is undef and the other side can be memset")
 - rust-lang#137902 (Make `ast::TokenKind` more like `lexer::TokenKind`)
 - rust-lang#137921 (Subtree update of `rust-analyzer`)
 - rust-lang#137922 (A few cleanups after the removal of `cfg(not(parallel))`)
 - rust-lang#137939 (fix order on shl impl)
 - rust-lang#137946 (Fix docker run-local docs)
 - rust-lang#137955 (Always allow rustdoc-json tests to contain long lines)
 - rust-lang#137958 (triagebot.toml: Don't label `test/rustdoc-json` as A-rustdoc-search)

r? `@ghost`
`@rustbot` modify labels: rollup
GuillaumeGomez pushed a commit to GuillaumeGomez/rust that referenced this pull request Apr 18, 2025
@bors
Auto merge of rust-lang#137959 - matthiaskrgr:rollup-62vjvwr, r=matth…
ab17806 
…iaskrgr

Rollup of 12 pull requests

Successful merges:

 - rust-lang#135767 (Future incompatibility warning `unsupported_fn_ptr_calling_conventions`: Also warn in dependencies)
 - rust-lang#137852 (Remove layouting dead code for non-array SIMD types.)
 - rust-lang#137863 (Fix pretty printing of unsafe binders)
 - rust-lang#137882 (do not build additional stage on compiler paths)
 - rust-lang#137894 (Revert "store ScalarPair via memset when one side is undef and the other side can be memset")
 - rust-lang#137902 (Make `ast::TokenKind` more like `lexer::TokenKind`)
 - rust-lang#137921 (Subtree update of `rust-analyzer`)
 - rust-lang#137922 (A few cleanups after the removal of `cfg(not(parallel))`)
 - rust-lang#137939 (fix order on shl impl)
 - rust-lang#137946 (Fix docker run-local docs)
 - rust-lang#137955 (Always allow rustdoc-json tests to contain long lines)
 - rust-lang#137958 (triagebot.toml: Don't label `test/rustdoc-json` as A-rustdoc-search)

r? `@ghost`
`@rustbot` modify labels: rollup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@SparrowLii SparrowLii SparrowLii approved these changes

Assignees

@SparrowLii SparrowLii

Labels

A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-rustc-dev-guide Area: rustc-dev-guide 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.

Projects

None yet

Milestone

1.87.0

Development

Successfully merging this pull request may close these issues.

4 participants

@Zalathar @rustbot @SparrowLii @bors