diff options
| author | bors <bors@rust-lang.org> | 2020-02-26 01:48:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-26 01:48:27 +0000 |
| commit | 46f5aa93d47e9077775ad9038970fd4c77abaad7 (patch) | |
| tree | d60d68e8f7c959e8b453a7a0357b9b4d70473379 /src/libstd | |
| parent | 55a777cd92d50e7ba5e8b7c52246f630bcac35b4 (diff) | |
| parent | 83818628b24aac7ddd165882bc6dbae5236e4c0e (diff) | |
| download | rust-46f5aa93d47e9077775ad9038970fd4c77abaad7.tar.gz rust-46f5aa93d47e9077775ad9038970fd4c77abaad7.zip | |
Auto merge of #69474 - Dylan-DPC:rollup-ciotplu, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #67637 (Add primitive module to libcore) - #69387 (Deduplicate identifier printing a bit) - #69412 (Mark attributes consumed by `check_mod_attrs` as normal) - #69423 (syntax: Remove `Nt(Impl,Trait,Foreign)Item`) - #69429 (remove redundant clones and import) - #69457 (Clean up e0370 e0371) - #69468 ([master] Backport release notes of 1.41.1) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/lib.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 799585ffc0a..7b3c702b929 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -233,12 +233,12 @@ #![feature(allocator_internals)] #![feature(allow_internal_unsafe)] #![feature(allow_internal_unstable)] -#![feature(atomic_mut_ptr)] #![feature(arbitrary_self_types)] #![feature(array_error_internals)] #![feature(asm)] #![feature(assoc_int_consts)] #![feature(associated_type_bounds)] +#![feature(atomic_mut_ptr)] #![feature(box_syntax)] #![feature(c_variadic)] #![feature(cfg_target_has_atomic)] @@ -551,6 +551,9 @@ pub use core::{ trace_macros, }; +#[stable(feature = "core_primitive", since = "1.43.0")] +pub use core::primitive; + // Include a number of private modules that exist solely to provide // the rustdoc documentation for primitive types. Using `include!` // because rustdoc only looks for these modules at the crate level. |