Update prelude macros

Author: Voultapher

library/core/src/prelude/v1.rs

@@ -59,6 +59,7 @@ pub use crate::hash::macros::Hash;
 
 #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
 #[doc(no_inline)]
+#[allow(deprecated)]
 pub use crate::{
     assert, assert_eq, assert_ne, cfg, column, compile_error, concat, debug_assert, debug_assert_eq, debug_assert_ne, file, format_args, include, include_bytes, include_str, line, matches, module_path, option_env, stringify, todo, r#try, unimplemented, unreachable, write, writeln,
 };
@@ -76,9 +77,9 @@ mod ambiguous_macro_only {
 #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
 pub use self::ambiguous_macro_only::{env, panic};
 
-#[unstable(feature = "cfg_match", issue = "115585")]
+#[unstable(feature = "cfg_select", issue = "115585")]
 #[doc(no_inline)]
-pub use crate::cfg_match;
+pub use crate::cfg_select;
 
 #[unstable(
     feature = "concat_bytes",
@@ -88,14 +89,6 @@ pub use crate::cfg_match;
 #[doc(no_inline)]
 pub use crate::concat_bytes;
 
-#[unstable(
-    feature = "concat_idents",
-    issue = "29599",
-    reason = "`concat_idents` is not stable enough for use and is subject to change"
-)]
-#[doc(no_inline)]
-pub use crate::concat_idents;
-
 #[unstable(feature = "const_format_args", issue = "none")]
 #[doc(no_inline)]
 pub use crate::const_format_args;

library/std/src/prelude/v1.rs

@@ -46,6 +46,7 @@ pub use crate::result::Result::{self, Err, Ok};
 // Re-exported built-in macros and traits
 #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
 #[doc(no_inline)]
+#[allow(deprecated)]
 pub use core::prelude::v1::{
     assert, assert_eq, assert_ne, cfg, column, compile_error, concat, debug_assert, debug_assert_eq, debug_assert_ne, env, file, format_args, include, include_bytes, include_str, line, matches,
     module_path, option_env, stringify, todo, r#try, unimplemented, unreachable, write,
@@ -71,9 +72,9 @@ mod ambiguous_macro_only_std {
 #[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
 pub use self::ambiguous_macro_only_std::{vec, panic};
 
-#[unstable(feature = "cfg_match", issue = "115585")]
+#[unstable(feature = "cfg_select", issue = "115585")]
 #[doc(no_inline)]
-pub use core::prelude::v1::cfg_match;
+pub use core::prelude::v1::cfg_select;
 
 #[unstable(
     feature = "concat_bytes",
@@ -83,14 +84,6 @@ pub use core::prelude::v1::cfg_match;
 #[doc(no_inline)]
 pub use core::prelude::v1::concat_bytes;
 
-#[unstable(
-    feature = "concat_idents",
-    issue = "29599",
-    reason = "`concat_idents` is not stable enough for use and is subject to change"
-)]
-#[doc(no_inline)]
-pub use core::prelude::v1::concat_idents;
-
 #[unstable(feature = "const_format_args", issue = "none")]
 #[doc(no_inline)]
 pub use core::prelude::v1::const_format_args;