diff options
| author | bors <bors@rust-lang.org> | 2024-04-06 17:12:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-06 17:12:12 +0000 |
| commit | aa1c45908df252a5b0c14e1bcb38c6c55ae02efe (patch) | |
| tree | 15725fe8a1c54cea5863dc9810193ff55a460d1f /library/std/src | |
| parent | 773fb88e13b06174d0ba48191731ea43ab6ac668 (diff) | |
| parent | 3a203b0ada03326a71fa443658a790063f10c1af (diff) | |
| download | rust-aa1c45908df252a5b0c14e1bcb38c6c55ae02efe.tar.gz rust-aa1c45908df252a5b0c14e1bcb38c6c55ae02efe.zip | |
Auto merge of #123557 - GuillaumeGomez:rollup-3af7urf, r=GuillaumeGomez
Rollup of 4 pull requests Successful merges: - #123541 (remove miri-test-libstd hacks that are no longer needed) - #123552 (Add missing -Zquery-dep-graph to the spike-neg incr comp tests) - #123553 (Miri subtree update) - #123554 (Simplify/cleanup `search-result-color.goml`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/lib.rs | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 31a8711e0eb..b509503ce4d 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -212,13 +212,7 @@ //! [rust-discord]: https://discord.gg/rust-lang //! [array]: prim@array //! [slice]: prim@slice -// To run std tests without x.py without ending up with two copies of std, 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 effect there. -#![cfg(any(not(feature = "miri-test-libstd"), test, doctest))] -// miri-test-libstd also prefers to make std use the sysroot versions of the dependencies. -#![cfg_attr(feature = "miri-test-libstd", feature(rustc_private))] -// + #![cfg_attr(not(feature = "restricted-std"), stable(feature = "rust1", since = "1.0.0"))] #![cfg_attr(feature = "restricted-std", unstable(feature = "restricted_std", issue = "none"))] #![cfg_attr(not(bootstrap), rustc_preserve_ub_checks)] |