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.
This commit is contained in:
Corey Farwell 2018-01-09 22:28:22 -05:00 committed by GitHub
commit 2b61564f26

View file

@ -316,7 +316,6 @@ impl<'a> Location<'a> {
/// # Examples /// # Examples
/// ///
/// ```should_panic /// ```should_panic
/// #![feature(panic_col)]
/// use std::panic; /// use std::panic;
/// ///
/// panic::set_hook(Box::new(|panic_info| { /// panic::set_hook(Box::new(|panic_info| {
@ -329,7 +328,7 @@ impl<'a> Location<'a> {
/// ///
/// panic!("Normal panic"); /// panic!("Normal panic");
/// ``` /// ```
#[unstable(feature = "panic_col", reason = "recently added", issue = "42939")] #[stable(feature = "panic_col", since = "1.25")]
pub fn column(&self) -> u32 { pub fn column(&self) -> u32 {
self.col self.col
} }