Skip to content

Commit 8e3b9d2

Browse files
author
Stjepan Glavina
committed
Stabilize todo macro
1 parent 7096ff0 commit 8e3b9d2

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

src/libcore/macros.rs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ macro_rules! writeln {
450450
/// The unsafe counterpart of this macro is the [`unreachable_unchecked`] function, which
451451
/// will cause undefined behavior if the code is reached.
452452
///
453-
/// [`panic!`]: ../std/macro.panic.html
453+
/// [`panic!`]: ../std/macro.panic.html
454454
/// [`unreachable_unchecked`]: ../std/hint/fn.unreachable_unchecked.html
455455
/// [`std::hint`]: ../std/hint/index.html
456456
///
@@ -459,6 +459,7 @@ macro_rules! writeln {
459459
/// This will always [`panic!`]
460460
///
461461
/// [`panic!`]: ../std/macro.panic.html
462+
///
462463
/// # Examples
463464
///
464465
/// Match arms:
@@ -510,6 +511,9 @@ macro_rules! unreachable {
510511
/// code type-check, or if you're implementing a trait that requires multiple
511512
/// methods, and you're only planning on using one of them.
512513
///
514+
/// There is no difference between `unimplemented!` and `todo!` apart from the
515+
/// name.
516+
///
513517
/// # Panics
514518
///
515519
/// This will always [panic!](macro.panic.html)
@@ -564,8 +568,10 @@ macro_rules! unimplemented {
564568
/// Indicates unfinished code.
565569
///
566570
/// This can be useful if you are prototyping and are just looking to have your
567-
/// code typecheck. `todo!` works exactly like `unimplemented!`. The only
568-
/// difference between the two macros is the name.
571+
/// code typecheck.
572+
///
573+
/// There is no difference between `unimplemented!` and `todo!` apart from the
574+
/// name.
569575
///
570576
/// # Panics
571577
///
@@ -587,8 +593,6 @@ macro_rules! unimplemented {
587593
/// `baz()`, so we can use `todo!`:
588594
///
589595
/// ```
590-
/// #![feature(todo_macro)]
591-
///
592596
/// # trait Foo {
593597
/// # fn bar(&self);
594598
/// # fn baz(&self);
@@ -614,7 +618,7 @@ macro_rules! unimplemented {
614618
/// }
615619
/// ```
616620
#[macro_export]
617-
#[unstable(feature = "todo_macro", issue = "59277")]
621+
#[stable(feature = "todo_macro", since = "1.37.0")]
618622
macro_rules! todo {
619623
() => (panic!("not yet implemented"));
620624
($($arg:tt)+) => (panic!("not yet implemented: {}", format_args!($($arg)*)));

src/libstd/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,6 @@
298298
#![feature(stmt_expr_attributes)]
299299
#![feature(str_internals)]
300300
#![feature(thread_local)]
301-
#![feature(todo_macro)]
302301
#![feature(toowned_clone_into)]
303302
#![feature(try_reserve)]
304303
#![feature(unboxed_closures)]

0 commit comments

Comments
 (0)