diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2019-12-19 17:53:58 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-19 17:53:58 -0500 |
| commit | 5f64777e63ad368887df0a9325917ccdbce4d240 (patch) | |
| tree | 3ec858ec8bd3f7411f1f54b1b3a2c8f5c8fc5543 | |
| parent | 8f20e675018d95dab6c39fef7a124f9ba7c4fc8c (diff) | |
| parent | df93bab13582ac905061eb0df0f19bbb626e0dad (diff) | |
| download | rust-5f64777e63ad368887df0a9325917ccdbce4d240.tar.gz rust-5f64777e63ad368887df0a9325917ccdbce4d240.zip | |
Rollup merge of #67436 - NieDzejkob:todo-stabilization-fix, r=alexcrichton
Correct the todo! stabilization version None
| -rw-r--r-- | src/libcore/macros/mod.rs | 2 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/macros/mod.rs b/src/libcore/macros/mod.rs index cf460745ffa..dd06da7a6d2 100644 --- 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)+))); diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 340313b06dd..9930b8f63af 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -524,8 +524,8 @@ pub use core::{ unreachable, write, writeln, - // Unstable todo, + // Unstable matches, }; |