diff options
| author | bors <bors@rust-lang.org> | 2019-10-29 19:12:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-10-29 19:12:01 +0000 |
| commit | aa69777ea2902208b24b3fd77767d577ceaf6386 (patch) | |
| tree | a10b62394886dfbfb294a55a71cd434c34d239ae /src/libstd | |
| parent | caa1f8d7b3b021c86a70ff62d23a07d97acff4c4 (diff) | |
| parent | db496864601f127f260b0810919c309fe60679c5 (diff) | |
| download | rust-aa69777ea2902208b24b3fd77767d577ceaf6386.tar.gz rust-aa69777ea2902208b24b3fd77767d577ceaf6386.zip | |
Auto merge of #65943 - tmandry:rollup-g20uvkh, r=tmandry
Rollup of 12 pull requests
Successful merges:
- #65405 (Create new error E0742 and add long error explanation)
- #65539 (resolve: Turn the "non-empty glob must import something" error into a lint)
- #65724 (ci: refactor pr tools job skipping)
- #65741 (Prevent help popup to disappear when clicking on it)
- #65832 (Re-enable Emscripten's exception handling support)
- #65843 (Enable dist for MIPS64 musl targets)
- #65898 (add basic HermitCore support within libtest)
- #65900 (proc_macro: clean up bridge::client::__run_expand{1,2} a bit.)
- #65906 (Update mdbook to 0.3.3)
- #65920 (Use rustc-workspace-hack for rustbook)
- #65930 (doc: use new feature gate for c_void type)
- #65936 (save-analysis: Account for async desugaring in async fn return types)
Failed merges:
- #65434 (Add long error explanation for E0577)
r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/ffi/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/ffi/mod.rs b/src/libstd/ffi/mod.rs index 69fcfa8b39c..28d9906eb93 100644 --- a/src/libstd/ffi/mod.rs +++ b/src/libstd/ffi/mod.rs @@ -163,7 +163,7 @@ pub use self::c_str::{FromBytesWithNulError}; #[stable(feature = "rust1", since = "1.0.0")] pub use self::os_str::{OsString, OsStr}; -#[stable(feature = "raw_os", since = "1.1.0")] +#[stable(feature = "core_c_void", since = "1.30.0")] pub use core::ffi::c_void; #[unstable(feature = "c_variadic", |