diff options
| author | bors <bors@rust-lang.org> | 2022-04-29 09:33:29 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-29 09:33:29 +0000 |
| commit | 87937d3b6c302dfedfa5c4b94d0a30985d46298d (patch) | |
| tree | d9254072c3b95525f649b1b8c9da49250d758e64 /library/std/src | |
| parent | 5560c51738c48d4881c31f7a081011531d14114e (diff) | |
| parent | 48199e0e3fb3f77bfa5befc2bc485280ad922f53 (diff) | |
| download | rust-87937d3b6c302dfedfa5c4b94d0a30985d46298d.tar.gz rust-87937d3b6c302dfedfa5c4b94d0a30985d46298d.zip | |
Auto merge of #96548 - Dylan-DPC:rollup-m3xkqxg, r=Dylan-DPC
Rollup of 5 pull requests Successful merges: - #96477 (Update data layout string for wasm64-unknown-unknown) - #96481 (HashMap doc: Don't use monospace font for 'Entry Api') - #96492 (Revert "Re-export core::ffi types from std::ffi") - #96516 (Revert diagnostic duplication and accidental stabilization) - #96523 (Add ``@feat.00`` symbol to symbols.o for COFF) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/collections/hash/map.rs | 2 | ||||
| -rw-r--r-- | library/std/src/ffi/mod.rs | 9 | ||||
| -rw-r--r-- | library/std/src/lib.rs | 1 |
3 files changed, 1 insertions, 11 deletions
diff --git a/library/std/src/collections/hash/map.rs b/library/std/src/collections/hash/map.rs index 6b63191eb58..0c638192264 100644 --- a/library/std/src/collections/hash/map.rs +++ b/library/std/src/collections/hash/map.rs @@ -136,7 +136,7 @@ use crate::sys; /// ]); /// ``` /// -/// `HashMap` implements an [`Entry API`](#method.entry), which allows +/// `HashMap` implements an [`Entry` API](#method.entry), which allows /// for complex methods of getting, setting, updating and removing keys and /// their values: /// diff --git a/library/std/src/ffi/mod.rs b/library/std/src/ffi/mod.rs index 0141a2bccdf..10983a33232 100644 --- a/library/std/src/ffi/mod.rs +++ b/library/std/src/ffi/mod.rs @@ -171,15 +171,6 @@ pub use self::os_str::{OsStr, OsString}; #[stable(feature = "core_c_void", since = "1.30.0")] pub use core::ffi::c_void; -#[unstable(feature = "core_ffi_c", issue = "94501")] -pub use core::ffi::{ - c_char, c_double, c_float, c_int, c_long, c_longlong, c_schar, c_short, c_uchar, c_uint, - c_ulong, c_ulonglong, c_ushort, -}; - -#[unstable(feature = "c_size_t", issue = "88345")] -pub use core::ffi::{c_ptrdiff_t, c_size_t, c_ssize_t}; - #[unstable( feature = "c_variadic", reason = "the `c_variadic` feature has not been properly tested on \ diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index f60b604f1b1..97c30c42282 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -307,7 +307,6 @@ // Only for re-exporting: #![feature(assert_matches)] #![feature(async_iterator)] -#![feature(c_size_t)] #![feature(c_variadic)] #![feature(cfg_accessible)] #![feature(cfg_eval)] |