Skip to content

Commit 263e3c5

Browse files
committed
Remove __rust_unstable_column
1 parent a9ecfd7 commit 263e3c5

File tree

9 files changed

+2
-30
lines changed

9 files changed

+2
-30
lines changed

src/libcore/macros.rs

+1-8
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
///
33
/// For details, see `std::macros`.
44
#[macro_export]
5-
#[allow_internal_unstable(core_panic, __rust_unstable_column)]
5+
#[allow_internal_unstable(core_panic)]
66
#[stable(feature = "core", since = "1.6.0")]
77
macro_rules! panic {
88
() => (
@@ -927,13 +927,6 @@ pub(crate) mod builtin {
927927
#[macro_export]
928928
macro_rules! column { () => { /* compiler built-in */ } }
929929

930-
/// Same as `column`, but less likely to be shadowed.
931-
#[unstable(feature = "__rust_unstable_column", issue = "0",
932-
reason = "internal implementation detail of the `panic` macro")]
933-
#[rustc_builtin_macro]
934-
#[macro_export]
935-
macro_rules! __rust_unstable_column { () => { /* compiler built-in */ } }
936-
937930
/// Expands to the file name in which it was invoked.
938931
///
939932
/// With [`line!`] and [`column!`], these macros provide debugging information for

src/libcore/prelude/v1.rs

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ pub use crate::hash::macros::Hash;
5656
#[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
5757
#[doc(no_inline)]
5858
pub use crate::{
59-
__rust_unstable_column,
6059
asm,
6160
assert,
6261
cfg,

src/libstd/lib.rs

-2
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@
228228
// std is implemented with unstable features, many of which are internal
229229
// compiler details that will never be stable
230230
// NB: the following list is sorted to minimize merge conflicts.
231-
#![feature(__rust_unstable_column)]
232231
#![feature(alloc_error_handler)]
233232
#![feature(alloc_layout_extra)]
234233
#![feature(allocator_api)]
@@ -550,7 +549,6 @@ pub use core::{
550549
option_env,
551550
stringify,
552551
// Unstable
553-
__rust_unstable_column,
554552
asm,
555553
concat_idents,
556554
format_args_nl,

src/libstd/macros.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
/// ```
5454
#[macro_export]
5555
#[stable(feature = "rust1", since = "1.0.0")]
56-
#[allow_internal_unstable(__rust_unstable_column, libstd_sys_internals)]
56+
#[allow_internal_unstable(libstd_sys_internals)]
5757
macro_rules! panic {
5858
() => ({
5959
$crate::panic!("explicit panic")

src/libstd/prelude/v1.rs

-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ pub use crate::result::Result::{self, Ok, Err};
4040
#[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
4141
#[doc(no_inline)]
4242
pub use core::prelude::v1::{
43-
__rust_unstable_column,
4443
asm,
4544
assert,
4645
cfg,

src/libsyntax_ext/lib.rs

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@ pub fn register_builtin_macros(resolver: &mut dyn syntax::ext::base::Resolver, e
5757
}
5858

5959
register_bang! {
60-
__rust_unstable_column: source_util::expand_column,
6160
asm: asm::expand_asm,
6261
assert: assert::expand_assert,
6362
cfg: cfg::expand_cfg,

src/libsyntax_pos/symbol.rs

-1
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,6 @@ symbols! {
610610
rust_eh_personality,
611611
rust_eh_unwind_resume,
612612
rust_oom,
613-
__rust_unstable_column,
614613
rvalue_static_promotion,
615614
sanitizer_runtime,
616615
_Self,

src/test/ui/rust-unstable-column-gated.rs

-4
This file was deleted.

src/test/ui/rust-unstable-column-gated.stderr

-11
This file was deleted.

0 commit comments

Comments
 (0)