diff --git a/library/core/src/macros/mod.rs b/library/core/src/macros/mod.rs index 08f37fcd470f6..80a3bad17c144 100644 --- a/library/core/src/macros/mod.rs +++ b/library/core/src/macros/mod.rs @@ -549,7 +549,6 @@ macro_rules! write { #[macro_export] #[stable(feature = "rust1", since = "1.0.0")] #[cfg_attr(not(test), rustc_diagnostic_item = "writeln_macro")] -#[allow_internal_unstable(format_args_ln)] macro_rules! writeln { ($dst:expr $(,)?) => { $crate::write!($dst, "\n") @@ -896,12 +895,7 @@ pub(crate) mod builtin { } /// Same as [`format_args`], but adds a newline in the end. - #[unstable( - feature = "format_args_ln", - issue = "none", - reason = "`format_args_ln` is only for internal \ - language use and is subject to change" - )] + #[stable(feature = "format_args_ln", since = "1.63.0")] #[allow_internal_unstable(fmt_internals)] #[cfg_attr(bootstrap, rustc_builtin_macro(format_args_nl))] #[cfg_attr(not(bootstrap), rustc_builtin_macro)] diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 0f840d29b128f..c8547c48a537a 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -318,7 +318,6 @@ #![feature(core_panic)] #![feature(custom_test_frameworks)] #![feature(edition_panic)] -#![feature(format_args_ln)] #![feature(log_syntax)] #![feature(once_cell)] #![feature(saturating_int_impl)] diff --git a/library/std/src/macros.rs b/library/std/src/macros.rs index a511c08716887..abc23b6e10d60 100644 --- a/library/std/src/macros.rs +++ b/library/std/src/macros.rs @@ -97,7 +97,7 @@ macro_rules! print { #[macro_export] #[stable(feature = "rust1", since = "1.0.0")] #[cfg_attr(not(test), rustc_diagnostic_item = "println_macro")] -#[allow_internal_unstable(print_internals, format_args_ln)] +#[allow_internal_unstable(print_internals)] macro_rules! println { () => { $crate::print!("\n") @@ -163,7 +163,7 @@ macro_rules! eprint { #[macro_export] #[stable(feature = "eprint", since = "1.19.0")] #[cfg_attr(not(test), rustc_diagnostic_item = "eprintln_macro")] -#[allow_internal_unstable(print_internals, format_args_ln)] +#[allow_internal_unstable(print_internals)] macro_rules! eprintln { () => { $crate::eprint!("\n") diff --git a/src/test/ui/feature-gates/feature-gate-format_args_nl.rs b/src/test/ui/feature-gates/feature-gate-format_args_nl.rs deleted file mode 100644 index 20155b323cb90..0000000000000 --- a/src/test/ui/feature-gates/feature-gate-format_args_nl.rs +++ /dev/null @@ -1,3 +0,0 @@ -fn main() { - format_args_ln!(""); //~ ERROR `format_args_ln` is only for internal language use -} diff --git a/src/test/ui/feature-gates/feature-gate-format_args_nl.stderr b/src/test/ui/feature-gates/feature-gate-format_args_nl.stderr deleted file mode 100644 index 9e2230018ffff..0000000000000 --- a/src/test/ui/feature-gates/feature-gate-format_args_nl.stderr +++ /dev/null @@ -1,11 +0,0 @@ -error[E0658]: use of unstable library feature 'format_args_ln': `format_args_ln` is only for internal language use and is subject to change - --> $DIR/feature-gate-format_args_nl.rs:2:5 - | -LL | format_args_ln!(""); - | ^^^^^^^^^^^^^^ - | - = help: add `#![feature(format_args_ln)]` to the crate attributes to enable - -error: aborting due to previous error - -For more information about this error, try `rustc --explain E0658`. diff --git a/src/test/ui/hygiene/format-args.rs b/src/test/ui/hygiene/format-args.rs index ac8dd0757b3e7..619d209f1faa3 100644 --- a/src/test/ui/hygiene/format-args.rs +++ b/src/test/ui/hygiene/format-args.rs @@ -1,7 +1,6 @@ // check-pass #![allow(non_upper_case_globals)] -#![feature(format_args_ln)] static arg0: () = ();