Skip to content

Commit

Permalink
Rollup merge of rust-lang#46762 - est31:master, r=alexcrichton
Browse files Browse the repository at this point in the history
Stabilize the panic_col feature

I've added the panic_col feature in PR rust-lang#42938.
Now it's time to stabilize it!
Closes rust-lang#42939.
  • Loading branch information
frewsxcv authored Jan 10, 2018
2 parents 61452e5 + 2491814 commit 2b61564
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/libstd/panicking.rs
Original file line number Diff line number Diff line change
Expand Up @@ -316,7 +316,6 @@ impl<'a> Location<'a> {
/// # Examples
///
/// ```should_panic
/// #![feature(panic_col)]
/// use std::panic;
///
/// panic::set_hook(Box::new(|panic_info| {
Expand All @@ -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
}
Expand Down

0 comments on commit 2b61564

Please sign in to comment.