about summary refs log tree commit diff
path: root/src/libcore/hash
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-08-14 20:49:07 +0000
committerbors <bors@rust-lang.org>2019-08-14 20:49:07 +0000
commit082cf2f9d136166cd1d552d3fb5abb1c46c99a14 (patch)
tree6ef4da1d58e6bd5dde9b627629ab4e837d079469 /src/libcore/hash
parentc43d03a19f326f4a323569328cc501e86eb6d22e (diff)
parentf7ff36dcb27b48329e9b1c12f5b78d469fafc067 (diff)
downloadrust-082cf2f9d136166cd1d552d3fb5abb1c46c99a14.tar.gz
rust-082cf2f9d136166cd1d552d3fb5abb1c46c99a14.zip
Auto merge of #63534 - Mark-Simulacrum:stage0-bump, r=Centril
Bump to 1.39

r? @Centril
Diffstat (limited to 'src/libcore/hash')
-rw-r--r--src/libcore/hash/mod.rs2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/libcore/hash/mod.rs b/src/libcore/hash/mod.rs
index 685540ba6fc..b3971191123 100644
--- a/src/libcore/hash/mod.rs
+++ b/src/libcore/hash/mod.rs
@@ -199,7 +199,6 @@ pub trait Hash {
 }
 
 // Separate module to reexport the macro `Hash` from prelude without the trait `Hash`.
-#[cfg(not(bootstrap))]
 pub(crate) mod macros {
     /// Derive macro generating an impl of the trait `Hash`.
     #[rustc_builtin_macro]
@@ -208,7 +207,6 @@ pub(crate) mod macros {
     #[allow_internal_unstable(core_intrinsics)]
     pub macro Hash($item:item) { /* compiler built-in */ }
 }
-#[cfg(not(bootstrap))]
 #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
 #[doc(inline)]
 pub use macros::Hash;