Rollup merge of #67436 - NieDzejkob:todo-stabilization-fix, r=alexcrichton

Correct the todo! stabilization version None
2019-12-19 17:53:58 -05:00 · 2019-12-19 17:53:58 -05:00 · 5f64777e63
commit 5f64777e63
parent 8f20e67501 df93bab135
2 changed files with 2 additions and 2 deletions
--- a/src/libcore/macros/mod.rs
+++ b/src/libcore/macros/mod.rs
@ -686,7 +686,7 @@ macro_rules! unimplemented {
 /// }
 /// ```
 #[macro_export]
-#[stable(feature = "todo_macro", since = "1.39.0")]
+#[stable(feature = "todo_macro", since = "1.40.0")]
 macro_rules! todo {
    () => (panic!("not yet implemented"));
    ($($arg:tt)+) => (panic!("not yet implemented: {}", $crate::format_args!($($arg)+)));
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@ -524,8 +524,8 @@ pub mod task {
    unreachable,
    write,
    writeln,
-    // Unstable
    todo,
+    // Unstable
    matches,
 };