From 178de46116b4fc8c1d9b30007f5e5ed24c809881 Mon Sep 17 00:00:00 2001 From: Mark Rousskov Date: Thu, 26 Dec 2019 12:55:13 -0500 Subject: [PATCH 1/2] Add primitive module to libcore/std This re-exports the primitive types from libcore at `core::primitive` to allow macro authors to have a reliable location to use them from. --- src/libcore/lib.rs | 3 + src/libcore/primitive.rs | 67 +++++++++++++++++++ src/libstd/lib.rs | 5 +- .../resolve/resolve-primitive-fallback.stderr | 5 ++ src/test/ui/shadow-bool.rs | 18 +++++ 5 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 src/libcore/primitive.rs create mode 100644 src/test/ui/shadow-bool.rs diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 1fd70e1a1b0..257a6d371b7 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -262,6 +262,9 @@ mod bool; mod tuple; mod unit; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub mod primitive; + // Pull in the `core_arch` crate directly into libcore. The contents of // `core_arch` are in a different repository: rust-lang/stdarch. // diff --git a/src/libcore/primitive.rs b/src/libcore/primitive.rs new file mode 100644 index 00000000000..d37bbfaf5df --- /dev/null +++ b/src/libcore/primitive.rs @@ -0,0 +1,67 @@ +//! This module reexports the primitive types to allow usage that is not +//! possibly shadowed by other declared types. +//! +//! This is normally only useful in macro generated code. +//! +//! An example of this is when generating a new struct and an impl for it: +//! +//! ```rust,compile_fail +//! pub struct bool; +//! +//! impl QueryId for bool { +//! const SOME_PROPERTY: bool = true; +//! } +//! +//! # trait QueryId { const SOME_PROPERTY: core::primitive::bool; } +//! ``` +//! +//! Note that the `SOME_PROPERTY` associated constant would not compile, as its +//! type `bool` refers to the struct, rather than to the primitive bool type. +//! +//! A correct implementation could look like: +//! +//! ```rust +//! # #[allow(non_camel_case_types)] +//! pub struct bool; +//! +//! impl QueryId for bool { +//! const SOME_PROPERTY: core::primitive::bool = true; +//! } +//! +//! # trait QueryId { const SOME_PROPERTY: core::primitive::bool; } +//! ``` + +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use bool; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use char; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use f32; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use f64; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use i128; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use i16; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use i32; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use i64; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use i8; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use isize; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use str; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use u128; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use u16; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use u32; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use u64; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use u8; +#[stable(feature = "core_primitive", since = "1.42.0")] +pub use usize; diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index f9c9f224730..2b54481ab56 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)] @@ -550,6 +550,9 @@ pub use core::{ trace_macros, }; +#[stable(feature = "core_primitive", since = "1.42.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. diff --git a/src/test/ui/resolve/resolve-primitive-fallback.stderr b/src/test/ui/resolve/resolve-primitive-fallback.stderr index 92c2a032983..72a854346fa 100644 --- a/src/test/ui/resolve/resolve-primitive-fallback.stderr +++ b/src/test/ui/resolve/resolve-primitive-fallback.stderr @@ -9,6 +9,11 @@ error[E0412]: cannot find type `u8` in the crate root | LL | let _: ::u8; | ^^ not found in the crate root + | +help: possible candidate is found in another module, you can import it into scope + | +LL | use std::primitive::u8; + | error[E0061]: this function takes 0 parameters but 1 parameter was supplied --> $DIR/resolve-primitive-fallback.rs:3:5 diff --git a/src/test/ui/shadow-bool.rs b/src/test/ui/shadow-bool.rs new file mode 100644 index 00000000000..f290a329eaa --- /dev/null +++ b/src/test/ui/shadow-bool.rs @@ -0,0 +1,18 @@ +// check-pass + +mod bar { + pub trait QueryId { + const SOME_PROPERTY: bool; + } +} + +use bar::QueryId; + +#[allow(non_camel_case_types)] +pub struct bool; + +impl QueryId for bool { + const SOME_PROPERTY: core::primitive::bool = true; +} + +fn main() {} From 9c3ee1bc351fcfabcfd47947dc44b0c020427181 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Sun, 23 Feb 2020 23:59:39 -0800 Subject: [PATCH 2/2] Bump core::primitive to 1.43 --- src/libcore/lib.rs | 2 +- src/libcore/primitive.rs | 34 +++++++++++++++++----------------- src/libstd/lib.rs | 2 +- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 257a6d371b7..b939462afc7 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -262,7 +262,7 @@ mod bool; mod tuple; mod unit; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub mod primitive; // Pull in the `core_arch` crate directly into libcore. The contents of diff --git a/src/libcore/primitive.rs b/src/libcore/primitive.rs index d37bbfaf5df..e20b2c5c938 100644 --- a/src/libcore/primitive.rs +++ b/src/libcore/primitive.rs @@ -31,37 +31,37 @@ //! # trait QueryId { const SOME_PROPERTY: core::primitive::bool; } //! ``` -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use bool; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use char; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use f32; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use f64; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use i128; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use i16; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use i32; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use i64; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use i8; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use isize; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use str; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use u128; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use u16; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use u32; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use u64; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use u8; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use usize; diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 2b54481ab56..a495d29cc47 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -550,7 +550,7 @@ pub use core::{ trace_macros, }; -#[stable(feature = "core_primitive", since = "1.42.0")] +#[stable(feature = "core_primitive", since = "1.43.0")] pub use core::primitive; // Include a number of private modules that exist solely to provide