about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorTyler Mandry <tmandry@gmail.com>2019-10-03 16:25:35 -0700
committerGitHub <noreply@github.com>2019-10-03 16:25:35 -0700
commitf7ee31e3d784324397c448677d230cc2f3161e3c (patch)
tree85c1b9267b27aa966f3559aac93df26718c8ed62 /src/libstd
parent032a53a06ce293571e51bbe621a5c480e8a28e95 (diff)
parent711f6735bc9461392331842b317abb0525973949 (diff)
Rollup merge of #61879 - stjepang:stabilize-todo, r=withoutboats
Stabilize todo macro

The `todo!` macro is just another name for `unimplemented!`.

Tracking issue: https://github.com/rust-lang/rust/issues/59277

This PR needs a FCP to merge.

r? @withoutboats
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/lib.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 5d9683f8ded..5ff32d7adaf 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -305,7 +305,6 @@
 #![feature(str_internals)]
 #![feature(test)]
 #![feature(thread_local)]
-#![feature(todo_macro)]
 #![feature(toowned_clone_into)]
 #![feature(trace_macros)]
 #![feature(try_reserve)]