diff options
| author | bors <bors@rust-lang.org> | 2025-10-02 11:14:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-10-02 11:14:37 +0000 |
| commit | 94ecb52bbeeccc990545d4ebc9e9c35dcaf285e3 (patch) | |
| tree | b3836c3f29d9f4ce549e329a6234adc437c1d5aa /library/std/tests/thread.rs | |
| parent | 4b9c62b4da3e17cee99d3d2052f1c576b188e2a8 (diff) | |
| parent | 2d1efe76bcf0871a580476841141441742198310 (diff) | |
| download | rust-94ecb52bbeeccc990545d4ebc9e9c35dcaf285e3.tar.gz rust-94ecb52bbeeccc990545d4ebc9e9c35dcaf285e3.zip | |
Auto merge of #147261 - matthiaskrgr:rollup-yh3fgvc, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - rust-lang/rust#146281 (Support `#[rustc_align_static]` inside `thread_local!`) - rust-lang/rust#146535 (mbe: Implement `unsafe` attribute rules) - rust-lang/rust#146585 (indexing: reword help) - rust-lang/rust#147004 (Tweak handling of "struct like start" where a struct isn't supported) - rust-lang/rust#147221 (Forbid `//@ compile-flags: -Cincremental=` in tests) - rust-lang/rust#147225 (Don't enable shared memory by default with Wasm atomics) - rust-lang/rust#147227 (implement `Box::take`) - rust-lang/rust#147233 (Initialize llvm submodule if not already the case to run citool) - rust-lang/rust#147236 (Update books) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/tests/thread.rs')
| -rw-r--r-- | library/std/tests/thread.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/library/std/tests/thread.rs b/library/std/tests/thread.rs index 29f220d8a70..dc8eadd7514 100644 --- a/library/std/tests/thread.rs +++ b/library/std/tests/thread.rs @@ -66,6 +66,8 @@ fn thread_local_hygeiene() { type Storage = (); type LazyStorage = (); type EagerStorage = (); + #[allow(non_camel_case_types)] + type usize = (); thread_local! { static A: LocalKey = const { () }; static B: Storage = const { () }; |