about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-10-29 01:25:34 +0000
committerbors <bors@rust-lang.org>2015-10-29 01:25:34 +0000
commitb4af35f7b1dc30468a043dabd689365f4e518bda (patch)
treeace55f220a0b039e39df04861c68ff6650963017 /src/libcore
parent8ca0acc25adb00d29e52b015bded4b2872a1170c (diff)
parent0809eaa7c05bdaef3fdd5efebdd3ff280a21668c (diff)
downloadrust-b4af35f7b1dc30468a043dabd689365f4e518bda.tar.gz
rust-b4af35f7b1dc30468a043dabd689365f4e518bda.zip
Auto merge of #29444 - steveklabnik:rollup, r=steveklabnik
- Successful merges: #29264, #29405, #29417, #29435, #29437, #29438
- Failed merges: 
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/macros.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs
index bb112327abf..5b5f59d5ddb 100644
--- a/src/libcore/macros.rs
+++ b/src/libcore/macros.rs
@@ -34,6 +34,8 @@ macro_rules! panic {
 /// This will invoke the `panic!` macro if the provided expression cannot be
 /// evaluated to `true` at runtime.
 ///
+/// This macro has a second version, where a custom panic message can be provided.
+///
 /// # Examples
 ///
 /// ```
@@ -99,6 +101,9 @@ macro_rules! assert_eq {
 /// This will invoke the `panic!` macro if the provided expression cannot be
 /// evaluated to `true` at runtime.
 ///
+/// Like `assert!`, this macro also has a second version, where a custom panic
+/// message can be provided.
+///
 /// Unlike `assert!`, `debug_assert!` statements are only enabled in non
 /// optimized builds by default. An optimized build will omit all
 /// `debug_assert!` statements unless `-C debug-assertions` is passed to the