Skip to content

Commit a2799ef

Browse files
committed
remove miri-test-libstd hacks that are no longer needed
1 parent 23d47db commit a2799ef

File tree

3 files changed

+2
-18
lines changed

3 files changed

+2
-18
lines changed

library/alloc/src/lib.rs

-6
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@
5656
//! [`Rc`]: rc
5757
//! [`RefCell`]: core::cell
5858
59-
// To run alloc tests without x.py without ending up with two copies of alloc, Miri needs to be
60-
// able to "empty" this crate. See <https://github.com/rust-lang/miri-test-libstd/issues/4>.
61-
// rustc itself never sets the feature, so this line has no effect there.
62-
#![cfg(any(not(feature = "miri-test-libstd"), test, doctest))]
63-
//
6459
#![allow(unused_attributes)]
6560
#![stable(feature = "alloc", since = "1.36.0")]
6661
#![doc(
@@ -71,7 +66,6 @@
7166
#![doc(cfg_hide(
7267
not(test),
7368
not(any(test, bootstrap)),
74-
any(not(feature = "miri-test-libstd"), test, doctest),
7569
no_global_oom_handling,
7670
not(no_global_oom_handling),
7771
not(no_rc),

library/core/src/lib.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,7 @@
5757
//
5858
// This cfg won't affect doc tests.
5959
#![cfg(not(test))]
60-
// To run core tests without x.py without ending up with two copies of core, Miri needs to be
61-
// able to "empty" this crate. See <https://github.com/rust-lang/miri-test-libstd/issues/4>.
62-
// rustc itself never sets the feature, so this line has no effect there.
63-
#![cfg(any(not(feature = "miri-test-libstd"), test, doctest))]
60+
//
6461
#![stable(feature = "core", since = "1.6.0")]
6562
#![doc(
6663
html_playground_url = "https://play.rust-lang.org/",
@@ -71,7 +68,6 @@
7168
#![doc(rust_logo)]
7269
#![doc(cfg_hide(
7370
not(test),
74-
any(not(feature = "miri-test-libstd"), test, doctest),
7571
no_fp_fmt_parse,
7672
target_pointer_width = "16",
7773
target_pointer_width = "32",

library/std/src/lib.rs

+1-7
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,7 @@
212212
//! [rust-discord]: https://discord.gg/rust-lang
213213
//! [array]: prim@array
214214
//! [slice]: prim@slice
215-
// To run std tests without x.py without ending up with two copies of std, Miri needs to be
216-
// able to "empty" this crate. See <https://github.com/rust-lang/miri-test-libstd/issues/4>.
217-
// rustc itself never sets the feature, so this line has no effect there.
218-
#![cfg(any(not(feature = "miri-test-libstd"), test, doctest))]
219-
// miri-test-libstd also prefers to make std use the sysroot versions of the dependencies.
220-
#![cfg_attr(feature = "miri-test-libstd", feature(rustc_private))]
221-
//
215+
222216
#![cfg_attr(not(feature = "restricted-std"), stable(feature = "rust1", since = "1.0.0"))]
223217
#![cfg_attr(feature = "restricted-std", unstable(feature = "restricted_std", issue = "none"))]
224218
#![cfg_attr(not(bootstrap), rustc_preserve_ub_checks)]

0 commit comments

Comments
 (0)