diff options
| author | bors <bors@rust-lang.org> | 2024-01-30 17:01:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-01-30 17:01:18 +0000 |
| commit | f3d71c9249072413f014b378bb5ea79c8a7dc9a7 (patch) | |
| tree | 6d35d2fb0886ceb2aa7858c88f7694ba2f1e9801 /library/std/src/os/mod.rs | |
| parent | 5ad7454f7503b6af2800bf4a7c875962cb03f913 (diff) | |
| parent | 27bc49656462c48f3b98ac1d8ce2b06d446e5ad3 (diff) | |
| download | rust-f3d71c9249072413f014b378bb5ea79c8a7dc9a7.tar.gz rust-f3d71c9249072413f014b378bb5ea79c8a7dc9a7.zip | |
Auto merge of #120496 - GuillaumeGomez:rollup-fmu9jre, r=GuillaumeGomez
Rollup of 11 pull requests Successful merges: - #117906 (Improve display of crate name when hovered) - #118533 (Suppress unhelpful diagnostics for unresolved top level attributes) - #120293 (Deduplicate more sized errors on call exprs) - #120295 (Remove `raw_os_nonzero` feature.) - #120310 (adapt test for v0 symbol mangling) - #120342 (Remove various `has_errors` or `err_count` uses) - #120434 (Revert outdated version of "Add the wasm32-wasi-preview2 target") - #120445 (Fix some `Arc` allocator leaks) - #120475 (Improve error message when `cargo build` is used to build the compiler) - #120476 (Remove some unnecessary check logic for lang items in HIR typeck) - #120485 (add missing potential_query_instability for keys and values in hashmap) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/os/mod.rs')
| -rw-r--r-- | library/std/src/os/mod.rs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/library/std/src/os/mod.rs b/library/std/src/os/mod.rs index f03e0790305..6e11b92b618 100644 --- a/library/std/src/os/mod.rs +++ b/library/std/src/os/mod.rs @@ -85,9 +85,6 @@ pub mod linux; #[cfg(any(target_os = "wasi", doc))] pub mod wasi; -#[cfg(any(all(target_os = "wasi", target_env = "preview2"), doc))] -pub mod wasi_preview2; - // windows #[cfg(not(all( doc, |