Skip to content

Commit ab332f1

Browse files
authored
Unrolled build for rust-lang#140351
Rollup merge of rust-lang#140351 - rust-lang:notriddle/stability-use, r=thomcc docs: fix incorrect stability markers on `std::{todo, matches}` This regression appeared in 916cfbc. The change is behaving as expected (a non-glob re-export uses the stability marker on the `use` item, not the original one), but this part of the standard library didn't follow it. Fixes rust-lang#140344
2 parents deb9479 + 9fed91f commit ab332f1

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

library/std/src/lib.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,14 @@ pub use core::cfg_match;
703703
reason = "`concat_bytes` is not stable enough for use and is subject to change"
704704
)]
705705
pub use core::concat_bytes;
706+
#[stable(feature = "matches_macro", since = "1.42.0")]
707+
#[allow(deprecated, deprecated_in_future)]
708+
pub use core::matches;
706709
#[stable(feature = "core_primitive", since = "1.43.0")]
707710
pub use core::primitive;
711+
#[stable(feature = "todo_macro", since = "1.40.0")]
712+
#[allow(deprecated, deprecated_in_future)]
713+
pub use core::todo;
708714
// Re-export built-in macros defined through core.
709715
#[stable(feature = "builtin_macro_prelude", since = "1.38.0")]
710716
#[allow(deprecated)]
@@ -718,8 +724,8 @@ pub use core::{
718724
#[stable(feature = "rust1", since = "1.0.0")]
719725
#[allow(deprecated, deprecated_in_future)]
720726
pub use core::{
721-
assert_eq, assert_ne, debug_assert, debug_assert_eq, debug_assert_ne, matches, todo, r#try,
722-
unimplemented, unreachable, write, writeln,
727+
assert_eq, assert_ne, debug_assert, debug_assert_eq, debug_assert_ne, r#try, unimplemented,
728+
unreachable, write, writeln,
723729
};
724730

725731
// Include a number of private modules that exist solely to provide

0 commit comments

Comments
 (0)