about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-09-21 08:12:37 -0700
committerGitHub <noreply@github.com>2016-09-21 08:12:37 -0700
commit53f97302910bdfd9080648991d31b000a21d877d (patch)
tree3420465929dcbf23974f994e50ece05ad55cef1c /src/libstd
parent5cc6c6b1b76960441c39ef29e951f22de45da15b (diff)
parent3d8d55787b2c0f5b1aba01b08da13bf0d612818c (diff)
downloadrust-53f97302910bdfd9080648991d31b000a21d877d.tar.gz
rust-53f97302910bdfd9080648991d31b000a21d877d.zip
Auto merge of #35074 - ashleygwilliams:assert_ne, r=steveklabnik
add debug_assert_ne + assert_ne

~~✨ work in progress, please do not merge ✨~~

fixes #35073
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 115a24fc83c..912045453e0 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -304,8 +304,8 @@ use prelude::v1::*;
 // We want to reexport a few macros from core but libcore has already been
 // imported by the compiler (via our #[no_std] attribute) In this case we just
 // add a new crate name so we can attach the reexports to it.
-#[macro_reexport(assert, assert_eq, debug_assert, debug_assert_eq,
-                 unreachable, unimplemented, write, writeln, try)]
+#[macro_reexport(assert, assert_eq, assert_ne, debug_assert, debug_assert_eq,
+                 debug_assert_ne, unreachable, unimplemented, write, writeln, try)]
 extern crate core as __core;
 
 #[macro_use]