diff options
Diffstat (limited to 'meta-python')
-rw-r--r-- | meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc | 30 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python3-pydantic-core/0001-Upgrade-radium-to-1.0.patch | 540 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python3-pydantic-core/0001-cargo.toml-Update-bitvec-to-use-radium-1.x.patch | 59 | ||||
-rw-r--r-- | meta-python/recipes-devtools/python/python3-pydantic-core_2.34.1.bb (renamed from meta-python/recipes-devtools/python/python3-pydantic-core_2.33.1.bb) | 7 |
4 files changed, 618 insertions, 18 deletions
diff --git a/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc b/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc index 8c2a25dd7a..86b72c0e9a 100644 --- a/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc +++ b/meta-python/recipes-devtools/python/python3-pydantic-core-crates.inc | |||
@@ -48,14 +48,15 @@ SRC_URI += " \ | |||
48 | crate://crates.io/percent-encoding/2.3.1 \ | 48 | crate://crates.io/percent-encoding/2.3.1 \ |
49 | crate://crates.io/portable-atomic/1.6.0 \ | 49 | crate://crates.io/portable-atomic/1.6.0 \ |
50 | crate://crates.io/proc-macro2/1.0.86 \ | 50 | crate://crates.io/proc-macro2/1.0.86 \ |
51 | crate://crates.io/pyo3/0.24.0 \ | 51 | crate://crates.io/pyo3/0.24.1 \ |
52 | crate://crates.io/pyo3-build-config/0.24.0 \ | 52 | crate://crates.io/pyo3-build-config/0.24.1 \ |
53 | crate://crates.io/pyo3-ffi/0.24.0 \ | 53 | crate://crates.io/pyo3-ffi/0.24.1 \ |
54 | crate://crates.io/pyo3-macros/0.24.0 \ | 54 | crate://crates.io/pyo3-macros/0.24.1 \ |
55 | crate://crates.io/pyo3-macros-backend/0.24.0 \ | 55 | crate://crates.io/pyo3-macros-backend/0.24.1 \ |
56 | crate://crates.io/python3-dll-a/0.2.13 \ | 56 | crate://crates.io/python3-dll-a/0.2.13 \ |
57 | crate://crates.io/quote/1.0.36 \ | 57 | crate://crates.io/quote/1.0.36 \ |
58 | crate://crates.io/radium/0.7.0 \ | 58 | crate://crates.io/radium/0.7.0 \ |
59 | crate://crates.io/radium/1.1.0 \ | ||
59 | crate://crates.io/regex/1.11.1 \ | 60 | crate://crates.io/regex/1.11.1 \ |
60 | crate://crates.io/regex-automata/0.4.8 \ | 61 | crate://crates.io/regex-automata/0.4.8 \ |
61 | crate://crates.io/regex-syntax/0.8.5 \ | 62 | crate://crates.io/regex-syntax/0.8.5 \ |
@@ -63,7 +64,7 @@ SRC_URI += " \ | |||
63 | crate://crates.io/ryu/1.0.18 \ | 64 | crate://crates.io/ryu/1.0.18 \ |
64 | crate://crates.io/serde/1.0.218 \ | 65 | crate://crates.io/serde/1.0.218 \ |
65 | crate://crates.io/serde_derive/1.0.218 \ | 66 | crate://crates.io/serde_derive/1.0.218 \ |
66 | crate://crates.io/serde_json/1.0.138 \ | 67 | crate://crates.io/serde_json/1.0.140 \ |
67 | crate://crates.io/smallvec/1.14.0 \ | 68 | crate://crates.io/smallvec/1.14.0 \ |
68 | crate://crates.io/speedate/0.15.0 \ | 69 | crate://crates.io/speedate/0.15.0 \ |
69 | crate://crates.io/stable_deref_trait/1.2.0 \ | 70 | crate://crates.io/stable_deref_trait/1.2.0 \ |
@@ -80,7 +81,7 @@ SRC_URI += " \ | |||
80 | crate://crates.io/url/2.5.4 \ | 81 | crate://crates.io/url/2.5.4 \ |
81 | crate://crates.io/utf16_iter/1.0.5 \ | 82 | crate://crates.io/utf16_iter/1.0.5 \ |
82 | crate://crates.io/utf8_iter/1.0.4 \ | 83 | crate://crates.io/utf8_iter/1.0.4 \ |
83 | crate://crates.io/uuid/1.15.1 \ | 84 | crate://crates.io/uuid/1.16.0 \ |
84 | crate://crates.io/version_check/0.9.5 \ | 85 | crate://crates.io/version_check/0.9.5 \ |
85 | crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ | 86 | crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ |
86 | crate://crates.io/write16/1.0.0 \ | 87 | crate://crates.io/write16/1.0.0 \ |
@@ -142,14 +143,15 @@ SRC_URI[once_cell-1.19.0.sha256sum] = "3fdb12b2476b595f9358c5161aa467c2438859caa | |||
142 | SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" | 143 | SRC_URI[percent-encoding-2.3.1.sha256sum] = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" |
143 | SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" | 144 | SRC_URI[portable-atomic-1.6.0.sha256sum] = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" |
144 | SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" | 145 | SRC_URI[proc-macro2-1.0.86.sha256sum] = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" |
145 | SRC_URI[pyo3-0.24.0.sha256sum] = "7f1c6c3591120564d64db2261bec5f910ae454f01def849b9c22835a84695e86" | 146 | SRC_URI[pyo3-0.24.1.sha256sum] = "17da310086b068fbdcefbba30aeb3721d5bb9af8db4987d6735b2183ca567229" |
146 | SRC_URI[pyo3-build-config-0.24.0.sha256sum] = "e9b6c2b34cf71427ea37c7001aefbaeb85886a074795e35f161f5aecc7620a7a" | 147 | SRC_URI[pyo3-build-config-0.24.1.sha256sum] = "e27165889bd793000a098bb966adc4300c312497ea25cf7a690a9f0ac5aa5fc1" |
147 | SRC_URI[pyo3-ffi-0.24.0.sha256sum] = "5507651906a46432cdda02cd02dd0319f6064f1374c9147c45b978621d2c3a9c" | 148 | SRC_URI[pyo3-ffi-0.24.1.sha256sum] = "05280526e1dbf6b420062f3ef228b78c0c54ba94e157f5cb724a609d0f2faabc" |
148 | SRC_URI[pyo3-macros-0.24.0.sha256sum] = "b0d394b5b4fd8d97d48336bb0dd2aebabad39f1d294edd6bcd2cccf2eefe6f42" | 149 | SRC_URI[pyo3-macros-0.24.1.sha256sum] = "5c3ce5686aa4d3f63359a5100c62a127c9f15e8398e5fdeb5deef1fed5cd5f44" |
149 | SRC_URI[pyo3-macros-backend-0.24.0.sha256sum] = "fd72da09cfa943b1080f621f024d2ef7e2773df7badd51aa30a2be1f8caa7c8e" | 150 | SRC_URI[pyo3-macros-backend-0.24.1.sha256sum] = "f4cf6faa0cbfb0ed08e89beb8103ae9724eb4750e3a78084ba4017cbe94f3855" |
150 | SRC_URI[python3-dll-a-0.2.13.sha256sum] = "49fe4227a288cf9493942ad0220ea3f185f4d1f2a14f197f7344d6d02f4ed4ed" | 151 | SRC_URI[python3-dll-a-0.2.13.sha256sum] = "49fe4227a288cf9493942ad0220ea3f185f4d1f2a14f197f7344d6d02f4ed4ed" |
151 | SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" | 152 | SRC_URI[quote-1.0.36.sha256sum] = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" |
152 | SRC_URI[radium-0.7.0.sha256sum] = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" | 153 | SRC_URI[radium-0.7.0.sha256sum] = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" |
154 | SRC_URI[radium-1.1.0.sha256sum] = "db0b76288902db304c864a12046b73d2d895cc34a4bb8137baaeebe9978a072c" | ||
153 | SRC_URI[regex-1.11.1.sha256sum] = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" | 155 | SRC_URI[regex-1.11.1.sha256sum] = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" |
154 | SRC_URI[regex-automata-0.4.8.sha256sum] = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" | 156 | SRC_URI[regex-automata-0.4.8.sha256sum] = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" |
155 | SRC_URI[regex-syntax-0.8.5.sha256sum] = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" | 157 | SRC_URI[regex-syntax-0.8.5.sha256sum] = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" |
@@ -157,7 +159,7 @@ SRC_URI[rustversion-1.0.17.sha256sum] = "955d28af4278de8121b7ebeb796b6a45735dc01 | |||
157 | SRC_URI[ryu-1.0.18.sha256sum] = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" | 159 | SRC_URI[ryu-1.0.18.sha256sum] = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" |
158 | SRC_URI[serde-1.0.218.sha256sum] = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" | 160 | SRC_URI[serde-1.0.218.sha256sum] = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" |
159 | SRC_URI[serde_derive-1.0.218.sha256sum] = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" | 161 | SRC_URI[serde_derive-1.0.218.sha256sum] = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" |
160 | SRC_URI[serde_json-1.0.138.sha256sum] = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" | 162 | SRC_URI[serde_json-1.0.140.sha256sum] = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" |
161 | SRC_URI[smallvec-1.14.0.sha256sum] = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd" | 163 | SRC_URI[smallvec-1.14.0.sha256sum] = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd" |
162 | SRC_URI[speedate-0.15.0.sha256sum] = "9a5e7adf4e07e7de39a64d77962ca14a09165e592d42d0c9f9acadb679f4f937" | 164 | SRC_URI[speedate-0.15.0.sha256sum] = "9a5e7adf4e07e7de39a64d77962ca14a09165e592d42d0c9f9acadb679f4f937" |
163 | SRC_URI[stable_deref_trait-1.2.0.sha256sum] = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" | 165 | SRC_URI[stable_deref_trait-1.2.0.sha256sum] = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" |
@@ -174,7 +176,7 @@ SRC_URI[unindent-0.2.3.sha256sum] = "c7de7d73e1754487cb58364ee906a499937a0dfabd8 | |||
174 | SRC_URI[url-2.5.4.sha256sum] = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" | 176 | SRC_URI[url-2.5.4.sha256sum] = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" |
175 | SRC_URI[utf16_iter-1.0.5.sha256sum] = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" | 177 | SRC_URI[utf16_iter-1.0.5.sha256sum] = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" |
176 | SRC_URI[utf8_iter-1.0.4.sha256sum] = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" | 178 | SRC_URI[utf8_iter-1.0.4.sha256sum] = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" |
177 | SRC_URI[uuid-1.15.1.sha256sum] = "e0f540e3240398cce6128b64ba83fdbdd86129c16a3aa1a3a252efd66eb3d587" | 179 | SRC_URI[uuid-1.16.0.sha256sum] = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9" |
178 | SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" | 180 | SRC_URI[version_check-0.9.5.sha256sum] = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" |
179 | SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" | 181 | SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" |
180 | SRC_URI[write16-1.0.0.sha256sum] = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" | 182 | SRC_URI[write16-1.0.0.sha256sum] = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" |
diff --git a/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Upgrade-radium-to-1.0.patch b/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Upgrade-radium-to-1.0.patch new file mode 100644 index 0000000000..00dcd634f2 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pydantic-core/0001-Upgrade-radium-to-1.0.patch | |||
@@ -0,0 +1,540 @@ | |||
1 | From 87753249fb9ac26acd1eb0135fefded871c24e6c Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 18 Apr 2025 17:54:42 -0700 | ||
4 | Subject: [PATCH] Upgrade radium to 1.0 | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/ferrilab/bitvec/pull/220] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | --- | ||
9 | Cargo.toml | 2 +- | ||
10 | src/macros/tests.rs | 256 ++++++++++++++++++++++---------------------- | ||
11 | src/mem.rs | 28 ++--- | ||
12 | src/serdes.rs | 58 +++++----- | ||
13 | src/store.rs | 61 +++++------ | ||
14 | 5 files changed, 207 insertions(+), 198 deletions(-) | ||
15 | |||
16 | --- a/Cargo.toml | ||
17 | +++ b/Cargo.toml | ||
18 | @@ -55,7 +55,7 @@ version = "^2.0" | ||
19 | default-features = false | ||
20 | |||
21 | [dependencies.radium] | ||
22 | -version = "0.7" | ||
23 | +version = "1" | ||
24 | |||
25 | [dependencies.serde] | ||
26 | version = "1" | ||
27 | --- a/src/macros/tests.rs | ||
28 | +++ b/src/macros/tests.rs | ||
29 | @@ -231,50 +231,52 @@ fn compile_bits() { | ||
30 | let _: &BitSlice<u64, Msb0> = bits![u64, crate::order::Msb0; 1; 100]; | ||
31 | } | ||
32 | |||
33 | - radium::if_atomic! { | ||
34 | - if atomic(8) { | ||
35 | - let _: &BitSlice<AtomicU8, LocalBits> = bits![AtomicU8, LocalBits; 0, 1]; | ||
36 | - let _: &BitSlice<AtomicU8, Lsb0> = bits![AtomicU8, Lsb0; 0, 1]; | ||
37 | - let _: &BitSlice<AtomicU8, Msb0> = bits![AtomicU8, Msb0; 0, 1]; | ||
38 | - let _: &BitSlice<RadiumU8, LocalBits> = bits![RadiumU8, LocalBits; 1; 100]; | ||
39 | - let _: &BitSlice<RadiumU8, Lsb0> = bits![RadiumU8, Lsb0; 1; 100]; | ||
40 | - let _: &BitSlice<RadiumU8, Msb0> = bits![RadiumU8, Msb0; 1; 100]; | ||
41 | - } | ||
42 | - if atomic(16) { | ||
43 | - let _: &BitSlice<AtomicU16, LocalBits> = bits![AtomicU16, LocalBits; 0, 1]; | ||
44 | - let _: &BitSlice<AtomicU16, Lsb0> = bits![AtomicU16, Lsb0; 0, 1]; | ||
45 | - let _: &BitSlice<AtomicU16, Msb0> = bits![AtomicU16, Msb0; 0, 1]; | ||
46 | - let _: &BitSlice<RadiumU16, LocalBits> = bits![RadiumU16, LocalBits; 1; 100]; | ||
47 | - let _: &BitSlice<RadiumU16, Lsb0> = bits![RadiumU16, Lsb0; 1; 100]; | ||
48 | - let _: &BitSlice<RadiumU16, Msb0> = bits![RadiumU16, Msb0; 1; 100]; | ||
49 | - } | ||
50 | - if atomic(32) { | ||
51 | - let _: &BitSlice<AtomicU32, LocalBits> = bits![AtomicU32, LocalBits; 0, 1]; | ||
52 | - let _: &BitSlice<AtomicU32, Lsb0> = bits![AtomicU32, Lsb0; 0, 1]; | ||
53 | - let _: &BitSlice<AtomicU32, Msb0> = bits![AtomicU32, Msb0; 0, 1]; | ||
54 | - let _: &BitSlice<RadiumU32, LocalBits> = bits![RadiumU32, LocalBits; 1; 100]; | ||
55 | - let _: &BitSlice<RadiumU32, Lsb0> = bits![RadiumU32, Lsb0; 1; 100]; | ||
56 | - let _: &BitSlice<RadiumU32, Msb0> = bits![RadiumU32, Msb0; 1; 100]; | ||
57 | - } | ||
58 | - if atomic(size) { | ||
59 | - let _: &BitSlice<AtomicUsize, LocalBits> = bits![AtomicUsize, LocalBits; 0, 1]; | ||
60 | - let _: &BitSlice<AtomicUsize, Lsb0> = bits![AtomicUsize, Lsb0; 0, 1]; | ||
61 | - let _: &BitSlice<AtomicUsize, Msb0> = bits![AtomicUsize, Msb0; 0, 1]; | ||
62 | - let _: &BitSlice<RadiumUsize, LocalBits> = bits![RadiumUsize, LocalBits; 1; 100]; | ||
63 | - let _: &BitSlice<RadiumUsize, Lsb0> = bits![RadiumUsize, Lsb0; 1; 100]; | ||
64 | - let _: &BitSlice<RadiumUsize, Msb0> = bits![RadiumUsize, Msb0; 1; 100]; | ||
65 | - } | ||
66 | + #[cfg(target_has_atomic = "8")] | ||
67 | + { | ||
68 | + let _: &BitSlice<AtomicU8, LocalBits> = bits![AtomicU8, LocalBits; 0, 1]; | ||
69 | + let _: &BitSlice<AtomicU8, Lsb0> = bits![AtomicU8, Lsb0; 0, 1]; | ||
70 | + let _: &BitSlice<AtomicU8, Msb0> = bits![AtomicU8, Msb0; 0, 1]; | ||
71 | + let _: &BitSlice<RadiumU8, LocalBits> = bits![RadiumU8, LocalBits; 1; 100]; | ||
72 | + let _: &BitSlice<RadiumU8, Lsb0> = bits![RadiumU8, Lsb0; 1; 100]; | ||
73 | + let _: &BitSlice<RadiumU8, Msb0> = bits![RadiumU8, Msb0; 1; 100]; | ||
74 | + } | ||
75 | + #[cfg(target_has_atomic = "16")] | ||
76 | + { | ||
77 | + let _: &BitSlice<AtomicU16, LocalBits> = bits![AtomicU16, LocalBits; 0, 1]; | ||
78 | + let _: &BitSlice<AtomicU16, Lsb0> = bits![AtomicU16, Lsb0; 0, 1]; | ||
79 | + let _: &BitSlice<AtomicU16, Msb0> = bits![AtomicU16, Msb0; 0, 1]; | ||
80 | + let _: &BitSlice<RadiumU16, LocalBits> = bits![RadiumU16, LocalBits; 1; 100]; | ||
81 | + let _: &BitSlice<RadiumU16, Lsb0> = bits![RadiumU16, Lsb0; 1; 100]; | ||
82 | + let _: &BitSlice<RadiumU16, Msb0> = bits![RadiumU16, Msb0; 1; 100]; | ||
83 | + } | ||
84 | + #[cfg(target_has_atomic = "32")] | ||
85 | + { | ||
86 | + let _: &BitSlice<AtomicU32, LocalBits> = bits![AtomicU32, LocalBits; 0, 1]; | ||
87 | + let _: &BitSlice<AtomicU32, Lsb0> = bits![AtomicU32, Lsb0; 0, 1]; | ||
88 | + let _: &BitSlice<AtomicU32, Msb0> = bits![AtomicU32, Msb0; 0, 1]; | ||
89 | + let _: &BitSlice<RadiumU32, LocalBits> = bits![RadiumU32, LocalBits; 1; 100]; | ||
90 | + let _: &BitSlice<RadiumU32, Lsb0> = bits![RadiumU32, Lsb0; 1; 100]; | ||
91 | + let _: &BitSlice<RadiumU32, Msb0> = bits![RadiumU32, Msb0; 1; 100]; | ||
92 | + } | ||
93 | + #[cfg(target_has_atomic = "ptr")] | ||
94 | + { | ||
95 | + let _: &BitSlice<AtomicUsize, LocalBits> = bits![AtomicUsize, LocalBits; 0, 1]; | ||
96 | + let _: &BitSlice<AtomicUsize, Lsb0> = bits![AtomicUsize, Lsb0; 0, 1]; | ||
97 | + let _: &BitSlice<AtomicUsize, Msb0> = bits![AtomicUsize, Msb0; 0, 1]; | ||
98 | + let _: &BitSlice<RadiumUsize, LocalBits> = bits![RadiumUsize, LocalBits; 1; 100]; | ||
99 | + let _: &BitSlice<RadiumUsize, Lsb0> = bits![RadiumUsize, Lsb0; 1; 100]; | ||
100 | + let _: &BitSlice<RadiumUsize, Msb0> = bits![RadiumUsize, Msb0; 1; 100]; | ||
101 | } | ||
102 | + | ||
103 | #[cfg(target_pointer_width = "64")] | ||
104 | - radium::if_atomic! { | ||
105 | - if atomic(64) { | ||
106 | - let _: &BitSlice<AtomicU64, LocalBits> = bits![AtomicU64, LocalBits; 0, 1]; | ||
107 | - let _: &BitSlice<AtomicU64, Lsb0> = bits![AtomicU64, Lsb0; 0, 1]; | ||
108 | - let _: &BitSlice<AtomicU64, Msb0> = bits![AtomicU64, Msb0; 0, 1]; | ||
109 | - let _: &BitSlice<RadiumU64, LocalBits> = bits![RadiumU64, LocalBits; 1; 100]; | ||
110 | - let _: &BitSlice<RadiumU64, Lsb0> = bits![RadiumU64, Lsb0; 1; 100]; | ||
111 | - let _: &BitSlice<RadiumU64, Msb0> = bits![RadiumU64, Msb0; 1; 100]; | ||
112 | - } | ||
113 | + #[cfg(target_has_atomic = "64")] | ||
114 | + { | ||
115 | + let _: &BitSlice<AtomicU64, LocalBits> = bits![AtomicU64, LocalBits; 0, 1]; | ||
116 | + let _: &BitSlice<AtomicU64, Lsb0> = bits![AtomicU64, Lsb0; 0, 1]; | ||
117 | + let _: &BitSlice<AtomicU64, Msb0> = bits![AtomicU64, Msb0; 0, 1]; | ||
118 | + let _: &BitSlice<RadiumU64, LocalBits> = bits![RadiumU64, LocalBits; 1; 100]; | ||
119 | + let _: &BitSlice<RadiumU64, Lsb0> = bits![RadiumU64, Lsb0; 1; 100]; | ||
120 | + let _: &BitSlice<RadiumU64, Msb0> = bits![RadiumU64, Msb0; 1; 100]; | ||
121 | } | ||
122 | } | ||
123 | |||
124 | @@ -346,50 +348,51 @@ fn compile_bitvec() { | ||
125 | bitvec![Cell<u64>, crate::order::Msb0; 1; 100]; | ||
126 | let _: BitVec<u64, Msb0> = bitvec![u64, crate::order::Msb0; 1; 100]; | ||
127 | } | ||
128 | - radium::if_atomic! { | ||
129 | - if atomic(8) { | ||
130 | - let _: BitVec<AtomicU8, LocalBits> =bitvec![AtomicU8, LocalBits; 0, 1]; | ||
131 | - let _: BitVec<AtomicU8, Lsb0> =bitvec![AtomicU8, Lsb0; 0, 1]; | ||
132 | - let _: BitVec<AtomicU8, Msb0> =bitvec![AtomicU8, Msb0; 0, 1]; | ||
133 | - let _: BitVec<RadiumU8, LocalBits> =bitvec![RadiumU8, LocalBits; 1; 100]; | ||
134 | - let _: BitVec<RadiumU8, Lsb0> =bitvec![RadiumU8, Lsb0; 1; 100]; | ||
135 | - let _: BitVec<RadiumU8, Msb0> =bitvec![RadiumU8, Msb0; 1; 100]; | ||
136 | - } | ||
137 | - if atomic(16) { | ||
138 | - let _: BitVec<AtomicU16, LocalBits> =bitvec![AtomicU16, LocalBits; 0, 1]; | ||
139 | - let _: BitVec<AtomicU16, Lsb0> =bitvec![AtomicU16, Lsb0; 0, 1]; | ||
140 | - let _: BitVec<AtomicU16, Msb0> =bitvec![AtomicU16, Msb0; 0, 1]; | ||
141 | - let _: BitVec<RadiumU16, LocalBits> =bitvec![RadiumU16, LocalBits; 1; 100]; | ||
142 | - let _: BitVec<RadiumU16, Lsb0> =bitvec![RadiumU16, Lsb0; 1; 100]; | ||
143 | - let _: BitVec<RadiumU16, Msb0> =bitvec![RadiumU16, Msb0; 1; 100]; | ||
144 | - } | ||
145 | - if atomic(32) { | ||
146 | - let _: BitVec<AtomicU32, LocalBits> =bitvec![AtomicU32, LocalBits; 0, 1]; | ||
147 | - let _: BitVec<AtomicU32, Lsb0> =bitvec![AtomicU32, Lsb0; 0, 1]; | ||
148 | - let _: BitVec<AtomicU32, Msb0> =bitvec![AtomicU32, Msb0; 0, 1]; | ||
149 | - let _: BitVec<RadiumU32, LocalBits> =bitvec![RadiumU32, LocalBits; 1; 100]; | ||
150 | - let _: BitVec<RadiumU32, Lsb0> =bitvec![RadiumU32, Lsb0; 1; 100]; | ||
151 | - let _: BitVec<RadiumU32, Msb0> =bitvec![RadiumU32, Msb0; 1; 100]; | ||
152 | - } | ||
153 | - if atomic(size) { | ||
154 | - let _: BitVec<AtomicUsize, LocalBits> =bitvec![AtomicUsize, LocalBits; 0, 1]; | ||
155 | - let _: BitVec<AtomicUsize, Lsb0> =bitvec![AtomicUsize, Lsb0; 0, 1]; | ||
156 | - let _: BitVec<AtomicUsize, Msb0> =bitvec![AtomicUsize, Msb0; 0, 1]; | ||
157 | - let _: BitVec<RadiumUsize, LocalBits> =bitvec![RadiumUsize, LocalBits; 1; 100]; | ||
158 | - let _: BitVec<RadiumUsize, Lsb0> =bitvec![RadiumUsize, Lsb0; 1; 100]; | ||
159 | - let _: BitVec<RadiumUsize, Msb0> =bitvec![RadiumUsize, Msb0; 1; 100]; | ||
160 | - } | ||
161 | + #[cfg(target_has_atomic = "8")] | ||
162 | + { | ||
163 | + let _: BitVec<AtomicU8, LocalBits> =bitvec![AtomicU8, LocalBits; 0, 1]; | ||
164 | + let _: BitVec<AtomicU8, Lsb0> =bitvec![AtomicU8, Lsb0; 0, 1]; | ||
165 | + let _: BitVec<AtomicU8, Msb0> =bitvec![AtomicU8, Msb0; 0, 1]; | ||
166 | + let _: BitVec<RadiumU8, LocalBits> =bitvec![RadiumU8, LocalBits; 1; 100]; | ||
167 | + let _: BitVec<RadiumU8, Lsb0> =bitvec![RadiumU8, Lsb0; 1; 100]; | ||
168 | + let _: BitVec<RadiumU8, Msb0> =bitvec![RadiumU8, Msb0; 1; 100]; | ||
169 | + } | ||
170 | + #[cfg(target_has_atomic = "16")] | ||
171 | + { | ||
172 | + let _: BitVec<AtomicU16, LocalBits> =bitvec![AtomicU16, LocalBits; 0, 1]; | ||
173 | + let _: BitVec<AtomicU16, Lsb0> =bitvec![AtomicU16, Lsb0; 0, 1]; | ||
174 | + let _: BitVec<AtomicU16, Msb0> =bitvec![AtomicU16, Msb0; 0, 1]; | ||
175 | + let _: BitVec<RadiumU16, LocalBits> =bitvec![RadiumU16, LocalBits; 1; 100]; | ||
176 | + let _: BitVec<RadiumU16, Lsb0> =bitvec![RadiumU16, Lsb0; 1; 100]; | ||
177 | + let _: BitVec<RadiumU16, Msb0> =bitvec![RadiumU16, Msb0; 1; 100]; | ||
178 | + } | ||
179 | + #[cfg(target_has_atomic = "32")] | ||
180 | + { | ||
181 | + let _: BitVec<AtomicU32, LocalBits> =bitvec![AtomicU32, LocalBits; 0, 1]; | ||
182 | + let _: BitVec<AtomicU32, Lsb0> =bitvec![AtomicU32, Lsb0; 0, 1]; | ||
183 | + let _: BitVec<AtomicU32, Msb0> =bitvec![AtomicU32, Msb0; 0, 1]; | ||
184 | + let _: BitVec<RadiumU32, LocalBits> =bitvec![RadiumU32, LocalBits; 1; 100]; | ||
185 | + let _: BitVec<RadiumU32, Lsb0> =bitvec![RadiumU32, Lsb0; 1; 100]; | ||
186 | + let _: BitVec<RadiumU32, Msb0> =bitvec![RadiumU32, Msb0; 1; 100]; | ||
187 | + } | ||
188 | + #[cfg(target_has_atomic = "ptr")] | ||
189 | + { | ||
190 | + let _: BitVec<AtomicUsize, LocalBits> =bitvec![AtomicUsize, LocalBits; 0, 1]; | ||
191 | + let _: BitVec<AtomicUsize, Lsb0> =bitvec![AtomicUsize, Lsb0; 0, 1]; | ||
192 | + let _: BitVec<AtomicUsize, Msb0> =bitvec![AtomicUsize, Msb0; 0, 1]; | ||
193 | + let _: BitVec<RadiumUsize, LocalBits> =bitvec![RadiumUsize, LocalBits; 1; 100]; | ||
194 | + let _: BitVec<RadiumUsize, Lsb0> =bitvec![RadiumUsize, Lsb0; 1; 100]; | ||
195 | + let _: BitVec<RadiumUsize, Msb0> =bitvec![RadiumUsize, Msb0; 1; 100]; | ||
196 | } | ||
197 | #[cfg(target_pointer_width = "64")] | ||
198 | - radium::if_atomic! { | ||
199 | - if atomic(64) { | ||
200 | - let _: BitVec<AtomicU64, LocalBits> =bitvec![AtomicU64, LocalBits; 0, 1]; | ||
201 | - let _: BitVec<AtomicU64, Lsb0> =bitvec![AtomicU64, Lsb0; 0, 1]; | ||
202 | - let _: BitVec<AtomicU64, Msb0> =bitvec![AtomicU64, Msb0; 0, 1]; | ||
203 | - let _: BitVec<RadiumU64, LocalBits> =bitvec![RadiumU64, LocalBits; 1; 100]; | ||
204 | - let _: BitVec<RadiumU64, Lsb0> =bitvec![RadiumU64, Lsb0; 1; 100]; | ||
205 | - let _: BitVec<RadiumU64, Msb0> =bitvec![RadiumU64, Msb0; 1; 100]; | ||
206 | - } | ||
207 | + #[cfg(target_has_atomic = "64")] | ||
208 | + { | ||
209 | + let _: BitVec<AtomicU64, LocalBits> =bitvec![AtomicU64, LocalBits; 0, 1]; | ||
210 | + let _: BitVec<AtomicU64, Lsb0> =bitvec![AtomicU64, Lsb0; 0, 1]; | ||
211 | + let _: BitVec<AtomicU64, Msb0> =bitvec![AtomicU64, Msb0; 0, 1]; | ||
212 | + let _: BitVec<RadiumU64, LocalBits> =bitvec![RadiumU64, LocalBits; 1; 100]; | ||
213 | + let _: BitVec<RadiumU64, Lsb0> =bitvec![RadiumU64, Lsb0; 1; 100]; | ||
214 | + let _: BitVec<RadiumU64, Msb0> =bitvec![RadiumU64, Msb0; 1; 100]; | ||
215 | } | ||
216 | } | ||
217 | |||
218 | @@ -461,50 +464,51 @@ fn compile_bitbox() { | ||
219 | bitbox![Cell<u64>, crate::order::Msb0; 1; 100]; | ||
220 | let _: BitBox<u64, Msb0> = bitbox![u64, crate::order::Msb0; 1; 100]; | ||
221 | } | ||
222 | - radium::if_atomic! { | ||
223 | - if atomic(8) { | ||
224 | - let _: BitBox<AtomicU8, LocalBits> =bitbox![AtomicU8, LocalBits; 0, 1]; | ||
225 | - let _: BitBox<AtomicU8, Lsb0> =bitbox![AtomicU8, Lsb0; 0, 1]; | ||
226 | - let _: BitBox<AtomicU8, Msb0> =bitbox![AtomicU8, Msb0; 0, 1]; | ||
227 | - let _: BitBox<RadiumU8, LocalBits> =bitbox![RadiumU8, LocalBits; 1; 100]; | ||
228 | - let _: BitBox<RadiumU8, Lsb0> =bitbox![RadiumU8, Lsb0; 1; 100]; | ||
229 | - let _: BitBox<RadiumU8, Msb0> =bitbox![RadiumU8, Msb0; 1; 100]; | ||
230 | - } | ||
231 | - if atomic(16) { | ||
232 | - let _: BitBox<AtomicU16, LocalBits> =bitbox![AtomicU16, LocalBits; 0, 1]; | ||
233 | - let _: BitBox<AtomicU16, Lsb0> =bitbox![AtomicU16, Lsb0; 0, 1]; | ||
234 | - let _: BitBox<AtomicU16, Msb0> =bitbox![AtomicU16, Msb0; 0, 1]; | ||
235 | - let _: BitBox<RadiumU16, LocalBits> =bitbox![RadiumU16, LocalBits; 1; 100]; | ||
236 | - let _: BitBox<RadiumU16, Lsb0> =bitbox![RadiumU16, Lsb0; 1; 100]; | ||
237 | - let _: BitBox<RadiumU16, Msb0> =bitbox![RadiumU16, Msb0; 1; 100]; | ||
238 | - } | ||
239 | - if atomic(32) { | ||
240 | - let _: BitBox<AtomicU32, LocalBits> =bitbox![AtomicU32, LocalBits; 0, 1]; | ||
241 | - let _: BitBox<AtomicU32, Lsb0> =bitbox![AtomicU32, Lsb0; 0, 1]; | ||
242 | - let _: BitBox<AtomicU32, Msb0> =bitbox![AtomicU32, Msb0; 0, 1]; | ||
243 | - let _: BitBox<RadiumU32, LocalBits> =bitbox![RadiumU32, LocalBits; 1; 100]; | ||
244 | - let _: BitBox<RadiumU32, Lsb0> =bitbox![RadiumU32, Lsb0; 1; 100]; | ||
245 | - let _: BitBox<RadiumU32, Msb0> =bitbox![RadiumU32, Msb0; 1; 100]; | ||
246 | - } | ||
247 | - if atomic(size) { | ||
248 | - let _: BitBox<AtomicUsize, LocalBits> =bitbox![AtomicUsize, LocalBits; 0, 1]; | ||
249 | - let _: BitBox<AtomicUsize, Lsb0> =bitbox![AtomicUsize, Lsb0; 0, 1]; | ||
250 | - let _: BitBox<AtomicUsize, Msb0> =bitbox![AtomicUsize, Msb0; 0, 1]; | ||
251 | - let _: BitBox<RadiumUsize, LocalBits> =bitbox![RadiumUsize, LocalBits; 1; 100]; | ||
252 | - let _: BitBox<RadiumUsize, Lsb0> =bitbox![RadiumUsize, Lsb0; 1; 100]; | ||
253 | - let _: BitBox<RadiumUsize, Msb0> =bitbox![RadiumUsize, Msb0; 1; 100]; | ||
254 | - } | ||
255 | + #[cfg(target_has_atomic = "8")] | ||
256 | + { | ||
257 | + let _: BitBox<AtomicU8, LocalBits> =bitbox![AtomicU8, LocalBits; 0, 1]; | ||
258 | + let _: BitBox<AtomicU8, Lsb0> =bitbox![AtomicU8, Lsb0; 0, 1]; | ||
259 | + let _: BitBox<AtomicU8, Msb0> =bitbox![AtomicU8, Msb0; 0, 1]; | ||
260 | + let _: BitBox<RadiumU8, LocalBits> =bitbox![RadiumU8, LocalBits; 1; 100]; | ||
261 | + let _: BitBox<RadiumU8, Lsb0> =bitbox![RadiumU8, Lsb0; 1; 100]; | ||
262 | + let _: BitBox<RadiumU8, Msb0> =bitbox![RadiumU8, Msb0; 1; 100]; | ||
263 | + } | ||
264 | + #[cfg(target_has_atomic = "16")] | ||
265 | + { | ||
266 | + let _: BitBox<AtomicU16, LocalBits> =bitbox![AtomicU16, LocalBits; 0, 1]; | ||
267 | + let _: BitBox<AtomicU16, Lsb0> =bitbox![AtomicU16, Lsb0; 0, 1]; | ||
268 | + let _: BitBox<AtomicU16, Msb0> =bitbox![AtomicU16, Msb0; 0, 1]; | ||
269 | + let _: BitBox<RadiumU16, LocalBits> =bitbox![RadiumU16, LocalBits; 1; 100]; | ||
270 | + let _: BitBox<RadiumU16, Lsb0> =bitbox![RadiumU16, Lsb0; 1; 100]; | ||
271 | + let _: BitBox<RadiumU16, Msb0> =bitbox![RadiumU16, Msb0; 1; 100]; | ||
272 | + } | ||
273 | + #[cfg(target_has_atomic = "32")] | ||
274 | + { | ||
275 | + let _: BitBox<AtomicU32, LocalBits> =bitbox![AtomicU32, LocalBits; 0, 1]; | ||
276 | + let _: BitBox<AtomicU32, Lsb0> =bitbox![AtomicU32, Lsb0; 0, 1]; | ||
277 | + let _: BitBox<AtomicU32, Msb0> =bitbox![AtomicU32, Msb0; 0, 1]; | ||
278 | + let _: BitBox<RadiumU32, LocalBits> =bitbox![RadiumU32, LocalBits; 1; 100]; | ||
279 | + let _: BitBox<RadiumU32, Lsb0> =bitbox![RadiumU32, Lsb0; 1; 100]; | ||
280 | + let _: BitBox<RadiumU32, Msb0> =bitbox![RadiumU32, Msb0; 1; 100]; | ||
281 | + } | ||
282 | + #[cfg(target_has_atomic = "ptr")] | ||
283 | + { | ||
284 | + let _: BitBox<AtomicUsize, LocalBits> =bitbox![AtomicUsize, LocalBits; 0, 1]; | ||
285 | + let _: BitBox<AtomicUsize, Lsb0> =bitbox![AtomicUsize, Lsb0; 0, 1]; | ||
286 | + let _: BitBox<AtomicUsize, Msb0> =bitbox![AtomicUsize, Msb0; 0, 1]; | ||
287 | + let _: BitBox<RadiumUsize, LocalBits> =bitbox![RadiumUsize, LocalBits; 1; 100]; | ||
288 | + let _: BitBox<RadiumUsize, Lsb0> =bitbox![RadiumUsize, Lsb0; 1; 100]; | ||
289 | + let _: BitBox<RadiumUsize, Msb0> =bitbox![RadiumUsize, Msb0; 1; 100]; | ||
290 | } | ||
291 | #[cfg(target_pointer_width = "64")] | ||
292 | - radium::if_atomic! { | ||
293 | - if atomic(64) { | ||
294 | - let _: BitBox<AtomicU64, LocalBits> =bitbox![AtomicU64, LocalBits; 0, 1]; | ||
295 | - let _: BitBox<AtomicU64, Lsb0> =bitbox![AtomicU64, Lsb0; 0, 1]; | ||
296 | - let _: BitBox<AtomicU64, Msb0> =bitbox![AtomicU64, Msb0; 0, 1]; | ||
297 | - let _: BitBox<RadiumU64, LocalBits> =bitbox![RadiumU64, LocalBits; 1; 100]; | ||
298 | - let _: BitBox<RadiumU64, Lsb0> =bitbox![RadiumU64, Lsb0; 1; 100]; | ||
299 | - let _: BitBox<RadiumU64, Msb0> =bitbox![RadiumU64, Msb0; 1; 100]; | ||
300 | - } | ||
301 | + #[cfg(target_has_atomic = "64")] | ||
302 | + { | ||
303 | + let _: BitBox<AtomicU64, LocalBits> =bitbox![AtomicU64, LocalBits; 0, 1]; | ||
304 | + let _: BitBox<AtomicU64, Lsb0> =bitbox![AtomicU64, Lsb0; 0, 1]; | ||
305 | + let _: BitBox<AtomicU64, Msb0> =bitbox![AtomicU64, Msb0; 0, 1]; | ||
306 | + let _: BitBox<RadiumU64, LocalBits> =bitbox![RadiumU64, LocalBits; 1; 100]; | ||
307 | + let _: BitBox<RadiumU64, Lsb0> =bitbox![RadiumU64, Lsb0; 1; 100]; | ||
308 | + let _: BitBox<RadiumU64, Msb0> =bitbox![RadiumU64, Msb0; 1; 100]; | ||
309 | } | ||
310 | } | ||
311 | |||
312 | --- a/src/mem.rs | ||
313 | +++ b/src/mem.rs | ||
314 | @@ -101,30 +101,30 @@ macro_rules! element { | ||
315 | } | ||
316 | } | ||
317 | |||
318 | - radium::if_atomic!( if atomic($size) { | ||
319 | - use core::sync::atomic::$atom; | ||
320 | - impl BitElement<$atom> { | ||
321 | - /// Creates a new element wrapper from a raw integer. | ||
322 | - pub const fn new(elem: $bare) -> Self { | ||
323 | - Self { | ||
324 | - elem: <$atom>::new(elem), | ||
325 | - } | ||
326 | + #[cfg(target_has_atomic = $size)] | ||
327 | + use core::sync::atomic::$atom; | ||
328 | + #[cfg(target_has_atomic = $size)] | ||
329 | + impl BitElement<$atom> { | ||
330 | + /// Creates a new element wrapper from a raw integer. | ||
331 | + pub const fn new(elem: $bare) -> Self { | ||
332 | + Self { | ||
333 | + elem: <$atom>::new(elem), | ||
334 | } | ||
335 | } | ||
336 | - }); | ||
337 | + } | ||
338 | )+ }; | ||
339 | } | ||
340 | |||
341 | element! { | ||
342 | - 8, u8 => AtomicU8; | ||
343 | - 16, u16 => AtomicU16; | ||
344 | - 32, u32 => AtomicU32; | ||
345 | + "8", u8 => AtomicU8; | ||
346 | + "16", u16 => AtomicU16; | ||
347 | + "32", u32 => AtomicU32; | ||
348 | } | ||
349 | |||
350 | #[cfg(target_pointer_width = "64")] | ||
351 | -element!(64, u64 => AtomicU64); | ||
352 | +element!("64", u64 => AtomicU64); | ||
353 | |||
354 | -element!(size, usize => AtomicUsize); | ||
355 | +element!("ptr", usize => AtomicUsize); | ||
356 | |||
357 | #[cfg(test)] | ||
358 | mod tests { | ||
359 | --- a/src/serdes.rs | ||
360 | +++ b/src/serdes.rs | ||
361 | @@ -112,36 +112,39 @@ mod tests { | ||
362 | Msb0 @ RadiumU8, RadiumU16, RadiumU32, RadiumUsize; | ||
363 | LocalBits @ RadiumU8, RadiumU16, RadiumU32, RadiumUsize; | ||
364 | } | ||
365 | - radium::if_atomic! { | ||
366 | - if atomic(8) { | ||
367 | - check_impl! { | ||
368 | - Lsb0 @ AtomicU8; | ||
369 | - Msb0 @ AtomicU8; | ||
370 | - LocalBits @ AtomicU8; | ||
371 | - } | ||
372 | + #[cfg(target_has_atomic = "8")] | ||
373 | + { | ||
374 | + check_impl! { | ||
375 | + Lsb0 @ AtomicU8; | ||
376 | + Msb0 @ AtomicU8; | ||
377 | + LocalBits @ AtomicU8; | ||
378 | } | ||
379 | - if atomic(16) { | ||
380 | - check_impl! { | ||
381 | - Lsb0 @ AtomicU16; | ||
382 | - Msb0 @ AtomicU16; | ||
383 | - LocalBits @ AtomicU16; | ||
384 | - } | ||
385 | + } | ||
386 | + #[cfg(target_has_atomic = "16")] | ||
387 | + { | ||
388 | + check_impl! { | ||
389 | + Lsb0 @ AtomicU16; | ||
390 | + Msb0 @ AtomicU16; | ||
391 | + LocalBits @ AtomicU16; | ||
392 | } | ||
393 | - if atomic(32) { | ||
394 | - check_impl! { | ||
395 | - Lsb0 @ AtomicU32; | ||
396 | - Msb0 @ AtomicU32; | ||
397 | - LocalBits @ AtomicU32; | ||
398 | - } | ||
399 | + } | ||
400 | + #[cfg(target_has_atomic = "32")] | ||
401 | + { | ||
402 | + check_impl! { | ||
403 | + Lsb0 @ AtomicU32; | ||
404 | + Msb0 @ AtomicU32; | ||
405 | + LocalBits @ AtomicU32; | ||
406 | } | ||
407 | - if atomic(ptr) { | ||
408 | - check_impl! { | ||
409 | - Lsb0 @ AtomicUsize; | ||
410 | - Msb0 @ AtomicUsize; | ||
411 | - LocalBits @ AtomicUsize; | ||
412 | - } | ||
413 | + } | ||
414 | + #[cfg(target_has_atomic = "ptr")] | ||
415 | + { | ||
416 | + check_impl! { | ||
417 | + Lsb0 @ AtomicUsize; | ||
418 | + Msb0 @ AtomicUsize; | ||
419 | + LocalBits @ AtomicUsize; | ||
420 | } | ||
421 | } | ||
422 | + | ||
423 | #[cfg(target_pointer_width = "64")] | ||
424 | check_impl! { | ||
425 | Lsb0 @ u64, RadiumU64; | ||
426 | @@ -149,12 +152,13 @@ mod tests { | ||
427 | LocalBits @ u64, RadiumU64; | ||
428 | } | ||
429 | #[cfg(target_pointer_width = "64")] | ||
430 | - radium::if_atomic!(if atomic(64) { | ||
431 | + #[cfg(target_has_atomic = "64")] | ||
432 | + { | ||
433 | check_impl! { | ||
434 | Lsb0 @ AtomicU64; | ||
435 | Msb0 @ AtomicU64; | ||
436 | LocalBits @ AtomicU64; | ||
437 | } | ||
438 | - }); | ||
439 | + } | ||
440 | } | ||
441 | } | ||
442 | --- a/src/store.rs | ||
443 | +++ b/src/store.rs | ||
444 | @@ -199,49 +199,49 @@ store!(usize => BitSafeUsize); | ||
445 | /// Generates `BitStore` implementations for atomic types. | ||
446 | macro_rules! atomic { | ||
447 | ($($size:tt, $base:ty => $atom:ident);+ $(;)?) => { $( | ||
448 | - radium::if_atomic!(if atomic($size) { | ||
449 | - use core::sync::atomic::$atom; | ||
450 | + #[cfg(target_has_atomic = $size)] | ||
451 | + use core::sync::atomic::$atom; | ||
452 | |||
453 | - impl BitStore for $atom { | ||
454 | - type Mem = $base; | ||
455 | - type Access = Self; | ||
456 | - type Alias = Self; | ||
457 | - type Unalias = Self; | ||
458 | - | ||
459 | - const ZERO: Self = <Self>::new(0); | ||
460 | - | ||
461 | - #[inline] | ||
462 | - fn new(value: Self::Mem) -> Self { <Self>::new(value) } | ||
463 | - | ||
464 | - #[inline] | ||
465 | - fn load_value(&self) -> Self::Mem { | ||
466 | - self.load(core::sync::atomic::Ordering::Relaxed) | ||
467 | - } | ||
468 | - | ||
469 | - #[inline] | ||
470 | - fn store_value(&mut self, value: Self::Mem) { | ||
471 | - *self = Self::new(value); | ||
472 | - } | ||
473 | - | ||
474 | - const ALIGNED_TO_SIZE: [(); 1] | ||
475 | - = [(); mem::aligned_to_size::<Self>() as usize]; | ||
476 | + #[cfg(target_has_atomic = $size)] | ||
477 | + impl BitStore for $atom { | ||
478 | + type Mem = $base; | ||
479 | + type Access = Self; | ||
480 | + type Alias = Self; | ||
481 | + type Unalias = Self; | ||
482 | + | ||
483 | + const ZERO: Self = <Self>::new(0); | ||
484 | + | ||
485 | + #[inline] | ||
486 | + fn new(value: Self::Mem) -> Self { <Self>::new(value) } | ||
487 | + | ||
488 | + #[inline] | ||
489 | + fn load_value(&self) -> Self::Mem { | ||
490 | + self.load(core::sync::atomic::Ordering::Relaxed) | ||
491 | + } | ||
492 | |||
493 | - const ALIAS_WIDTH: [(); 1] = [()]; | ||
494 | + #[inline] | ||
495 | + fn store_value(&mut self, value: Self::Mem) { | ||
496 | + *self = Self::new(value); | ||
497 | } | ||
498 | - }); | ||
499 | + | ||
500 | + const ALIGNED_TO_SIZE: [(); 1] | ||
501 | + = [(); mem::aligned_to_size::<Self>() as usize]; | ||
502 | + | ||
503 | + const ALIAS_WIDTH: [(); 1] = [()]; | ||
504 | + } | ||
505 | )+ }; | ||
506 | } | ||
507 | |||
508 | atomic! { | ||
509 | - 8, u8 => AtomicU8; | ||
510 | - 16, u16 => AtomicU16; | ||
511 | - 32, u32 => AtomicU32; | ||
512 | + "8", u8 => AtomicU8; | ||
513 | + "16", u16 => AtomicU16; | ||
514 | + "32", u32 => AtomicU32; | ||
515 | } | ||
516 | |||
517 | #[cfg(target_pointer_width = "64")] | ||
518 | -atomic!(64, u64 => AtomicU64); | ||
519 | +atomic!("64", u64 => AtomicU64); | ||
520 | |||
521 | -atomic!(size, usize => AtomicUsize); | ||
522 | +atomic!("ptr", usize => AtomicUsize); | ||
523 | |||
524 | #[cfg(test)] | ||
525 | mod tests { | ||
526 | @@ -265,11 +265,12 @@ mod tests { | ||
527 | cell.store_value(39); | ||
528 | assert_eq!(cell.load_value(), 39); | ||
529 | |||
530 | - radium::if_atomic!(if atomic(size) { | ||
531 | + #[cfg(target_has_atomic = "ptr")] | ||
532 | + { | ||
533 | let mut atom = AtomicUsize::new(0); | ||
534 | atom.store_value(57); | ||
535 | assert_eq!(atom.load_value(), 57); | ||
536 | - }); | ||
537 | + } | ||
538 | } | ||
539 | |||
540 | /// Unaliased `BitSlice`s are universally threadsafe, because they satisfy | ||
diff --git a/meta-python/recipes-devtools/python/python3-pydantic-core/0001-cargo.toml-Update-bitvec-to-use-radium-1.x.patch b/meta-python/recipes-devtools/python/python3-pydantic-core/0001-cargo.toml-Update-bitvec-to-use-radium-1.x.patch new file mode 100644 index 0000000000..4f2012e8a2 --- /dev/null +++ b/meta-python/recipes-devtools/python/python3-pydantic-core/0001-cargo.toml-Update-bitvec-to-use-radium-1.x.patch | |||
@@ -0,0 +1,59 @@ | |||
1 | From 560c73cffabc1c2e66552d7c248c0928211d3dea Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 19 Apr 2025 00:09:42 -0700 | ||
4 | Subject: [PATCH] cargo.toml: Update bitvec to use radium 1.x | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/ferrilab/bitvec/pull/220] | ||
7 | |||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
9 | --- | ||
10 | Cargo.lock | 25 +++++++++++++++++++++++-- | ||
11 | Cargo.toml | 1 + | ||
12 | 2 files changed, 24 insertions(+), 2 deletions(-) | ||
13 | |||
14 | --- a/Cargo.toml | ||
15 | +++ b/Cargo.toml | ||
16 | @@ -27,6 +27,8 @@ include = [ | ||
17 | rust-version = "1.75" | ||
18 | |||
19 | [dependencies] | ||
20 | +#bitvec = { git = "https://github.com/alexanderkjall/bitvec", branch = "upgrade-radium-to-1" } | ||
21 | +radium = "1" | ||
22 | # TODO it would be very nice to remove the "py-clone" feature as it can panic, | ||
23 | # but needs a bit of work to make sure it's not used in the codebase | ||
24 | pyo3 = { version = "0.24", features = ["generate-import-lib", "num-bigint", "py-clone"] } | ||
25 | --- a/Cargo.lock | ||
26 | +++ b/Cargo.lock | ||
27 | @@ -43,7 +43,7 @@ source = "registry+https://github.com/ru | ||
28 | checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" | ||
29 | dependencies = [ | ||
30 | "funty", | ||
31 | - "radium", | ||
32 | + "radium 1.1.0", | ||
33 | "tap", | ||
34 | "wyz", | ||
35 | ] | ||
36 | @@ -436,6 +436,7 @@ dependencies = [ | ||
37 | "num-traits", | ||
38 | "pyo3", | ||
39 | "pyo3-build-config", | ||
40 | + "radium 1.1.0", | ||
41 | "regex", | ||
42 | "serde", | ||
43 | "serde_json", | ||
44 | @@ -538,6 +539,15 @@ source = "registry+https://github.com/ru | ||
45 | checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" | ||
46 | |||
47 | [[package]] | ||
48 | +name = "radium" | ||
49 | +version = "1.1.0" | ||
50 | +source = "registry+https://github.com/rust-lang/crates.io-index" | ||
51 | +checksum = "db0b76288902db304c864a12046b73d2d895cc34a4bb8137baaeebe9978a072c" | ||
52 | +dependencies = [ | ||
53 | + "cfg-if", | ||
54 | +] | ||
55 | + | ||
56 | +[[package]] | ||
57 | name = "regex" | ||
58 | version = "1.11.1" | ||
59 | source = "registry+https://github.com/rust-lang/crates.io-index" | ||
diff --git a/meta-python/recipes-devtools/python/python3-pydantic-core_2.33.1.bb b/meta-python/recipes-devtools/python/python3-pydantic-core_2.34.1.bb index c7e57cff5b..0e2d065128 100644 --- a/meta-python/recipes-devtools/python/python3-pydantic-core_2.33.1.bb +++ b/meta-python/recipes-devtools/python/python3-pydantic-core_2.34.1.bb | |||
@@ -10,7 +10,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=ab599c188b4a314d2856b3a55030c75c" | |||
10 | 10 | ||
11 | require ${BPN}-crates.inc | 11 | require ${BPN}-crates.inc |
12 | 12 | ||
13 | SRC_URI[sha256sum] = "bcc9c6fdb0ced789245b02b7d6603e17d1563064ddcfc36f046b61c0c05dd9df" | 13 | SRC_URI += "file://0001-Upgrade-radium-to-1.0.patch;patchdir=${UNPACKDIR}/cargo_home/bitbake/bitvec-1.0.1/" |
14 | SRC_URI += "file://0001-cargo.toml-Update-bitvec-to-use-radium-1.x.patch" | ||
15 | SRC_URI[sha256sum] = "6bf31628ab6d0e7c7c0372419898c52ef0a447b33ab47c7f62053bd013cc5b09" | ||
14 | 16 | ||
15 | DEPENDS = "python3-maturin-native python3-typing-extensions" | 17 | DEPENDS = "python3-maturin-native python3-typing-extensions" |
16 | 18 | ||
@@ -46,6 +48,3 @@ do_install_ptest:append () { | |||
46 | } | 48 | } |
47 | 49 | ||
48 | BBCLASSEXTEND = "native nativesdk" | 50 | BBCLASSEXTEND = "native nativesdk" |
49 | |||
50 | # It needs bitvec to adopt radum 1.x see https://github.com/ferrilab/bitvec/pull/220 | ||
51 | COMPATIBLE_HOST:riscv32 = "null" | ||