Create `Atomic<T>` type alias by CAD97 · Pull Request #130543 · rust-lang/rust

CAD97 · 2024-09-19T04:19:18Z

and use it in core/alloc/std where possible, ignoring test files for now.

This is step one, creating the alias from Atomic<T> to AtomicT. The next step of flipping this and aliasing AtomicT to Atomic<T> will have a bigger impact, since AtomicT imports can be dropped once Atomic::new is a usable name.

First commit is the true change. Second commit is mostly mechanical replacement of AtomicT type names with Atomic<T>.

See how this was done for NonZero for the rough blueprint I'm following.

ACP: ACP: Generic Atomic<T> libs-team#443 (comment)
Tracking issue: Tracking Issue for generic Atomic #130539

rustbot · 2024-09-19T04:19:27Z

r? @Noratrieb

rustbot has assigned @Noratrieb.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

library/core/src/sync/atomic.rs

CAD97 · 2024-09-19T05:06:32Z

Alright that's the merge conflicts fixed. If I end up needing to continue playing catch-up on some of the touched files, I'll probably just drop files' touch-up to use Atomic<T> from this PR instead of continuously rebasing, as they create conflicts.

Noratrieb · 2024-09-19T05:22:55Z

r=me after fixing the import issues

CAD97 · 2024-09-19T05:40:33Z

Also found a similar conflict with the windows futex impl plumbing via local check, so that's also resolved by the amend (hopefully; my local checkout suddenly is complaining about duplicate rmeta for crate object for some reason).

IIRC I don't have perms to do this but might as well try:

@bors r=Noratrieb rollup=iffy

bors · 2024-09-19T05:40:36Z

@CAD97: 🔑 Insufficient privileges: Not in reviewers

bors · 2024-09-19T05:40:37Z

@CAD97: 🔑 Insufficient privileges: not in try users

workingjubilee · 2024-09-19T05:55:38Z

@bors r=Noratrieb rollup=iffy

bors · 2024-09-19T05:55:41Z

📌 Commit fbf092e has been approved by Noratrieb

It is now in the queue for this repository.

Create `Atomic<T>` type alias and use it in core/alloc/std where possible, ignoring test files for now. This is step one, creating the alias from `Atomic<T>` to `AtomicT`. The next step of flipping this and aliasing `AtomicT` to `Atomic<T>` will have a bigger impact, since `AtomicT` imports can be dropped once `Atomic::new` is a usable name. First commit is the true change. Second commit is mostly mechanical replacement of `AtomicT` type names with `Atomic<T>`. See [how this was done for `NonZero`](rust-lang#120257) for the rough blueprint I'm following. - ACP: rust-lang/libs-team#443 (comment) - Tracking issue: rust-lang#130539

in core/alloc/std only for now, and ignoring test files Co-authored-by: Pavel Grigorenko <GrigorenkoPV@ya.ru>

CAD97 · 2025-02-01T04:06:13Z

That should be fixed now

@rustbot review

Noratrieb · 2025-02-05T17:10:09Z

@bors r+

bors · 2025-02-05T17:10:13Z

📌 Commit 8ae16dd has been approved by Noratrieb

It is now in the queue for this repository.

Create `Atomic<T>` type alias and use it in core/alloc/std where possible, ignoring test files for now. This is step one, creating the alias from `Atomic<T>` to `AtomicT`. The next step of flipping this and aliasing `AtomicT` to `Atomic<T>` will have a bigger impact, since `AtomicT` imports can be dropped once `Atomic::new` is a usable name. First commit is the true change. Second commit is mostly mechanical replacement of `AtomicT` type names with `Atomic<T>`. See [how this was done for `NonZero`](rust-lang#120257) for the rough blueprint I'm following. - ACP: rust-lang/libs-team#443 (comment) - Tracking issue: rust-lang#130539

bors · 2025-02-06T00:19:05Z

⌛ Testing commit 8ae16dd with merge 7c80d00...

bors · 2025-02-06T00:42:26Z

☔ The latest upstream changes (presumably #136572) made this pull request unmergeable. Please resolve the merge conflicts.

rust-log-analyzer · 2025-02-06T00:52:01Z

The job x86_64-fuchsia failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

[RUSTC-TIMING] object test:false 7.804
error[E0107]: missing generics for type alias `core::sync::atomic::Atomic`
   --> library/std/src/sys/pal/unix/futex.rs:259:48
    |
259 |     pub type zx_futex_t = crate::sync::atomic::Atomic;
    |                                                ^^^^^^ expected 1 generic argument
note: type alias defined here, with 1 generic parameter: `T`
   --> /checkout/library/core/src/sync/atomic.rs:341:10
    |
    |
341 | pub type Atomic<T> = <T as AtomicPrimitive>::AtomicInner;
help: add missing generic argument
    |
    |
259 |     pub type zx_futex_t = crate::sync::atomic::Atomic<T>;

For more information about this error, try `rustc --explain E0107`.
[RUSTC-TIMING] std test:false 4.941
error: could not compile `std` (lib) due to 1 previous error

bors · 2025-02-06T00:52:46Z

💔 Test failed - checks-actions

CAD97 · 2025-02-06T06:51:27Z

🤦

Will fix that when I get a chance.

@rustbot author

…solve `<T as Trait>::AssocT` projections (#14125) changelog: [`declare_interior_mutable_const`, `borrow_interior_mutable_const`]: resolve `<T as Trait>::AssocT` projections --- This came up during rust-lang/rust#130543 where we have `<T as AtomicPrimitive>::Assoc = AtomicT` instead of just `AtomicT` and clippy failed to resolve that properly. This really needs a review, because - I don't know if `try_normalize_erasing_regions` is the right thing to call here. - I'm not sure if I peel off the correct amount of `ValTree::Branch` layers (I think I do). Also, shouldn't this lint's infrastructure rely on `Freeze` trait (rust-lang/rust#121675) instead of hardcoding a list of known-to-be-interior-mutable types? --- Previously filed this in the main rust repo (rust-lang/rust#136369), was asked to do it here instead (rust-lang/rust#136369 (comment)).

…Simulacrum Create `Atomic<T>` type alias (rebase) Rebase of rust-lang#130543. Additional changes: - Switch from `allow` to `expect` for `private_bounds` on `AtomicPrimitive` - Unhide `AtomicPrimitive::AtomicInner` from docs, because rustdoc shows the definition `pub type Atomic<T> = <T as AtomicPrimitive>::AtomicInner;` and generated links for it. - `NonZero` did not have this issue, because they kept the new alias private before the direction was changed. - Use `Atomic<_>` in more places, including inside `Once`'s `Futex`. This is possible thanks to rust-lang/rust-clippy#14125 The rest will either get moved back to rust-lang#130543 or rust-lang#130543 will be closed in favor of this instead. --- * ACP: rust-lang/libs-team#443 (comment) * Tracking issue: rust-lang#130539

GrigorenkoPV · 2025-04-28T15:35:56Z

This got merged in #136316, so it can now be closed, I think

…Simulacrum Create `Atomic<T>` type alias (rebase) Rebase of rust-lang#130543. Additional changes: - Switch from `allow` to `expect` for `private_bounds` on `AtomicPrimitive` - Unhide `AtomicPrimitive::AtomicInner` from docs, because rustdoc shows the definition `pub type Atomic<T> = <T as AtomicPrimitive>::AtomicInner;` and generated links for it. - `NonZero` did not have this issue, because they kept the new alias private before the direction was changed. - Use `Atomic<_>` in more places, including inside `Once`'s `Futex`. This is possible thanks to rust-lang/rust-clippy#14125 The rest will either get moved back to rust-lang#130543 or rust-lang#130543 will be closed in favor of this instead. --- * ACP: rust-lang/libs-team#443 (comment) * Tracking issue: rust-lang#130539

rustbot assigned Noratrieb Sep 19, 2024

CAD97 mentioned this pull request Sep 19, 2024

Tracking Issue for generic Atomic #130539

Open

7 tasks

This comment was marked as outdated.

Sign in to view

CAD97 force-pushed the generic-atomic branch from bacfd33 to cc104b1 Compare September 19, 2024 05:01

CAD97 commented Sep 19, 2024

View reviewed changes

library/core/src/sync/atomic.rs Show resolved Hide resolved

This comment has been minimized.

Sign in to view

Noratrieb approved these changes Sep 19, 2024

View reviewed changes

CAD97 force-pushed the generic-atomic branch 2 times, most recently from 67a79e8 to fbf092e Compare September 19, 2024 05:37

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 Sep 19, 2024

workingjubilee mentioned this pull request Sep 19, 2024

Rollup of 3 pull requests #130546

Closed

ojeda mentioned this pull request Sep 19, 2024

core wanted features & bugfixes Rust-for-Linux/linux#514

Open

19 tasks

CAD97 force-pushed the generic-atomic branch from fea08d4 to 83c5b7a Compare February 1, 2025 02:56

This comment has been minimized.

Sign in to view

use generic Atomic type where possible

8ae16dd

in core/alloc/std only for now, and ignoring test files Co-authored-by: Pavel Grigorenko <GrigorenkoPV@ya.ru>

CAD97 force-pushed the generic-atomic branch from 83c5b7a to 8ae16dd Compare February 1, 2025 03:04

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 1, 2025

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 Feb 5, 2025

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Feb 6, 2025

bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 6, 2025

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 6, 2025

Noratrieb mentioned this pull request Mar 6, 2025

Rollup of 42 pull requests #138086

Closed

Kobzol closed this Apr 28, 2025

Uh oh!

Conversation

CAD97 commented Sep 19, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Sep 19, 2024

Uh oh!

This comment was marked as outdated.

Uh oh!

CAD97 commented Sep 19, 2024

Uh oh!

This comment has been minimized.

Noratrieb commented Sep 19, 2024

Uh oh!

CAD97 commented Sep 19, 2024

Uh oh!

bors commented Sep 19, 2024

Uh oh!

bors commented Sep 19, 2024

Uh oh!

workingjubilee commented Sep 19, 2024

Uh oh!

bors commented Sep 19, 2024

Uh oh!

This comment has been minimized.

CAD97 commented Feb 1, 2025

Uh oh!

Noratrieb commented Feb 5, 2025

Uh oh!

bors commented Feb 5, 2025

Uh oh!

bors commented Feb 6, 2025

Uh oh!

bors commented Feb 6, 2025

Uh oh!

rust-log-analyzer commented Feb 6, 2025

Uh oh!

bors commented Feb 6, 2025

Uh oh!

CAD97 commented Feb 6, 2025

Uh oh!

GrigorenkoPV commented Apr 28, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

CAD97 commented Sep 19, 2024 •

edited

Loading