about summary refs log tree commit diff
path: root/src/librustc_data_structures
diff options
context:
space:
mode:
authorMark Rousskov <mark.simulacrum@gmail.com>2019-07-04 10:05:50 -0400
committerMark Rousskov <mark.simulacrum@gmail.com>2019-07-04 11:26:57 -0400
commit8a7dded1a249a21540583333204c378bf960a700 (patch)
treea3f2218f1d0ec0a122a3b947ed837268aa688981 /src/librustc_data_structures
parentb43eb4235ac43c822d903ad26ed806f34cc1a14a (diff)
downloadrust-8a7dded1a249a21540583333204c378bf960a700.tar.gz
rust-8a7dded1a249a21540583333204c378bf960a700.zip
Switch master to 1.38
Diffstat (limited to 'src/librustc_data_structures')
-rw-r--r--src/librustc_data_structures/macros.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/librustc_data_structures/macros.rs b/src/librustc_data_structures/macros.rs
index 6e7a8e98853..3f75523a815 100644
--- a/src/librustc_data_structures/macros.rs
+++ b/src/librustc_data_structures/macros.rs
@@ -1,7 +1,6 @@
 /// A simple static assertion macro.
 #[macro_export]
-#[cfg_attr(bootstrap, allow_internal_unstable(type_ascription, underscore_const_names))]
-#[cfg_attr(not(bootstrap), allow_internal_unstable(type_ascription))]
+#[allow_internal_unstable(type_ascription)]
 macro_rules! static_assert {
     ($test:expr) => {
         // Use the bool to access an array such that if the bool is false, the access
@@ -13,7 +12,6 @@ macro_rules! static_assert {
 
 /// Type size assertion. The first argument is a type and the second argument is its expected size.
 #[macro_export]
-#[cfg_attr(bootstrap, allow_internal_unstable(underscore_const_names))]
 macro_rules! static_assert_size {
     ($ty:ty, $size:expr) => {
         const _: [(); $size] = [(); ::std::mem::size_of::<$ty>()];