about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2018-01-09 22:28:22 -0500
committerGitHub <noreply@github.com>2018-01-09 22:28:22 -0500
commit2b61564f263edd49fa33f34c8acbc79a55959b8c (patch)
treeae5d3858cc5cfcd2ad685e904c63d833e014ed18 /src/libstd
parent61452e506f0c88861cccaeea4ced3419bdb3cbe0 (diff)
parent24918148bb2269508565d458efb39d6c8b6708b1 (diff)
downloadrust-2b61564f263edd49fa33f34c8acbc79a55959b8c.tar.gz
rust-2b61564f263edd49fa33f34c8acbc79a55959b8c.zip
Rollup merge of #46762 - est31:master, r=alexcrichton
Stabilize the panic_col feature

I've added the panic_col feature in PR #42938.
Now it's time to stabilize it!
Closes #42939.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/panicking.rs3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs
index 80ce15944a5..f91eaf433d7 100644
--- a/src/libstd/panicking.rs
+++ b/src/libstd/panicking.rs
@@ -316,7 +316,6 @@ impl<'a> Location<'a> {
     /// # Examples
     ///
     /// ```should_panic
-    /// #![feature(panic_col)]
     /// use std::panic;
     ///
     /// panic::set_hook(Box::new(|panic_info| {
@@ -329,7 +328,7 @@ impl<'a> Location<'a> {
     ///
     /// panic!("Normal panic");
     /// ```
-    #[unstable(feature = "panic_col", reason = "recently added", issue = "42939")]
+    #[stable(feature = "panic_col", since = "1.25")]
     pub fn column(&self) -> u32 {
         self.col
     }