diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2019-10-13 19:17:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-13 19:17:04 +0200 |
| commit | 7c20a8ddb8efd3998dc4de049ff69e3161a01788 (patch) | |
| tree | ca04dbf4f749320ed2a57f7e9a0e97eca43bdd95 /src/liballoc | |
| parent | aa2ae564d391a3da10bca2a79ab529a9925fbe58 (diff) | |
| parent | dfe76a10935cf93fdc72abc47167691b7aa44a7f (diff) | |
| download | rust-7c20a8ddb8efd3998dc4de049ff69e3161a01788.tar.gz rust-7c20a8ddb8efd3998dc4de049ff69e3161a01788.zip | |
Rollup merge of #65214 - Amanieu:cfg_atomic, r=alexcrichton
Split non-CAS atomic support off into target_has_atomic_load_store This PR implements my proposed changes in https://github.com/rust-lang/rust/issues/32976#issuecomment-518542029 by removing `target_has_atomic = "cas"` and splitting `target_has_atomic` into two separate `cfg`s: * `target_has_atomic = 8/16/32/64/128`: This indicates the largest width that the target can atomically CAS (which implies support for all atomic operations). * ` target_has_atomic_load_store = 8/16/32/64/128`: This indicates the largest width that the target can support loading or storing atomically (but may not support CAS). cc #32976 r? @alexcrichton
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index e6b174beaae..3684162d8b1 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -153,7 +153,7 @@ mod boxed { #[cfg(test)] mod tests; pub mod collections; -#[cfg(all(target_has_atomic = "ptr", target_has_atomic = "cas"))] +#[cfg(target_has_atomic = "ptr")] pub mod sync; pub mod rc; pub mod raw_vec; |