From a8556d77c69f2e1166ba878a51af0c0acdc16238 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Sat, 16 Dec 2017 08:54:52 +0100
Subject: [PATCH 1/2] Stabilize the panic_col feature

I've added the panic_col feature in PR #42938.
Now it's time to stabilize it!
Closes #42939.
---
 src/libstd/panicking.rs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs
index 80ce15944a5..fac1dc15918 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.24")]
     pub fn column(&self) -> u32 {
         self.col
     }

From 24918148bb2269508565d458efb39d6c8b6708b1 Mon Sep 17 00:00:00 2001
From: est31 <MTest31@outlook.com>
Date: Wed, 10 Jan 2018 03:24:24 +0100
Subject: [PATCH 2/2] We have Rust 1.25 now

---
 src/libstd/panicking.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstd/panicking.rs b/src/libstd/panicking.rs
index fac1dc15918..f91eaf433d7 100644
--- a/src/libstd/panicking.rs
+++ b/src/libstd/panicking.rs
@@ -328,7 +328,7 @@ impl<'a> Location<'a> {
     ///
     /// panic!("Normal panic");
     /// ```
-    #[stable(feature = "panic_col", since = "1.24")]
+    #[stable(feature = "panic_col", since = "1.25")]
     pub fn column(&self) -> u32 {
         self.col
     }