diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2023-06-16 14:46:15 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-16 14:46:15 +0530 |
| commit | 627f85cd5a80c18036e38cdfbe0b7a5ad94f7f26 (patch) | |
| tree | 994453a446ca516c4643c4549ea6355470d4ebd4 /library/alloc | |
| parent | 64f6c00772321324d77dfd8a0ee708fbb0d9a277 (diff) | |
| parent | 3b9b4e5e3d6b45be6d355f0685eb70d99c3ab50a (diff) | |
| download | rust-627f85cd5a80c18036e38cdfbe0b7a5ad94f7f26.tar.gz rust-627f85cd5a80c18036e38cdfbe0b7a5ad94f7f26.zip | |
Rollup merge of #112535 - RalfJung:miri-test-libstd, r=cuviper
reorder attributes to make miri-test-libstd work again Fixes fallout from https://github.com/rust-lang/rust/pull/110141
Diffstat (limited to 'library/alloc')
| -rw-r--r-- | library/alloc/src/lib.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/library/alloc/src/lib.rs b/library/alloc/src/lib.rs index 59fa91c1066..967ad3a0e69 100644 --- a/library/alloc/src/lib.rs +++ b/library/alloc/src/lib.rs @@ -56,6 +56,11 @@ //! [`Rc`]: rc //! [`RefCell`]: core::cell +// To run alloc tests without x.py without ending up with two copies of alloc, Miri needs to be +// able to "empty" this crate. See <https://github.com/rust-lang/miri-test-libstd/issues/4>. +// rustc itself never sets the feature, so this line has no affect there. +#![cfg(any(not(feature = "miri-test-libstd"), test, doctest))] +// #![allow(unused_attributes)] #![stable(feature = "alloc", since = "1.36.0")] #![doc( @@ -75,11 +80,6 @@ ))] #![no_std] #![needs_allocator] -// To run alloc tests without x.py without ending up with two copies of alloc, Miri needs to be -// able to "empty" this crate. See <https://github.com/rust-lang/miri-test-libstd/issues/4>. -// rustc itself never sets the feature, so this line has no affect there. -#![cfg(any(not(feature = "miri-test-libstd"), test, doctest))] -// // Lints: #![deny(unsafe_op_in_unsafe_fn)] #![deny(fuzzy_provenance_casts)] |