about summary refs log tree commit diff
path: root/src/libcore/panic.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-04-09 03:32:32 +0000
committerbors <bors@rust-lang.org>2018-04-09 03:32:32 +0000
commit8ae79efce3e43eadecd032cf38b2372b4cba7b62 (patch)
tree3cc57eb3f99e83e26ab489cd7e1e6bc295891bfb /src/libcore/panic.rs
parent292685e8965eb5dcd52637e93e93ebfd67b86615 (diff)
parent521e41e77d0c9213ff3ed3f2a5e863b600ce2c3a (diff)
downloadrust-8ae79efce3e43eadecd032cf38b2372b4cba7b62.tar.gz
rust-8ae79efce3e43eadecd032cf38b2372b4cba7b62.zip
Auto merge of #49673 - ollie27:stab, r=sfackler
Correct a few stability attributes

* `const_indexing` language feature was stabilized in 1.26.0 by #46882
* `Display` impls for `PanicInfo` and `Location` were stabilized in 1.26.0 by #47687
* `TrustedLen` is still unstable so its impls should be as well even though `RangeInclusive` was stabilized by #47813
* `!Send` and `!Sync` for `Args` and `ArgsOs` were stabilized in 1.26.0 by #48005
* `EscapeDefault` has been stable since 1.0.0 so should continue to show that even though it was moved to core in #48735

This could be backported to beta like #49612
Diffstat (limited to 'src/libcore/panic.rs')
-rw-r--r--src/libcore/panic.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libcore/panic.rs b/src/libcore/panic.rs
index 4e72eaa57c7..1720c9d8c60 100644
--- a/src/libcore/panic.rs
+++ b/src/libcore/panic.rs
@@ -120,6 +120,7 @@ impl<'a> PanicInfo<'a> {
     }
 }
 
+#[stable(feature = "panic_hook_display", since = "1.26.0")]
 impl<'a> fmt::Display for PanicInfo<'a> {
     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         formatter.write_str("panicked at ")?;
@@ -244,6 +245,7 @@ impl<'a> Location<'a> {
     }
 }
 
+#[stable(feature = "panic_hook_display", since = "1.26.0")]
 impl<'a> fmt::Display for Location<'a> {
     fn fmt(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
         write!(formatter, "{}:{}:{}", self.file, self.line, self.col)