diff options
| author | bors <bors@rust-lang.org> | 2021-06-22 09:30:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-06-22 09:30:15 +0000 |
| commit | 75ed34223adb02c7bbfa5ae5e62c48952ff29914 (patch) | |
| tree | ced3ec1c4cc8b540c86aabf77195373780a789f3 /library/std/src | |
| parent | 44f4a87d7047db0deff5ef033fd2af820722e9a5 (diff) | |
| parent | 52a6885c50698abad26a91e0643d336df4d6f39e (diff) | |
| download | rust-75ed34223adb02c7bbfa5ae5e62c48952ff29914.tar.gz rust-75ed34223adb02c7bbfa5ae5e62c48952ff29914.zip | |
Auto merge of #84910 - eopb:stabilize_int_error_matching, r=yaahc
stabilize `int_error_matching` closes #22639 > It has been over half a year since https://github.com/rust-lang/rust/pull/77640#pullrequestreview-511263516, and the indexing question is rejected in https://github.com/rust-lang/rust/pull/79728#pullrequestreview-633030341, so I guess we can submit another stabilization attempt? 😉 _Originally posted by `@kennytm` in https://github.com/rust-lang/rust/issues/22639#issuecomment-831738266_
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/lib.rs | 1 | ||||
| -rw-r--r-- | library/std/src/num.rs | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/library/std/src/lib.rs b/library/std/src/lib.rs index 1c66dc3648f..1cfa71e250f 100644 --- a/library/std/src/lib.rs +++ b/library/std/src/lib.rs @@ -278,7 +278,6 @@ #![feature(global_asm)] #![feature(hashmap_internals)] #![feature(int_error_internals)] -#![feature(int_error_matching)] #![feature(integer_atomics)] #![feature(into_future)] #![feature(intra_doc_pointers)] diff --git a/library/std/src/num.rs b/library/std/src/num.rs index 0f1c5962685..e7051f0ce95 100644 --- a/library/std/src/num.rs +++ b/library/std/src/num.rs @@ -22,12 +22,7 @@ pub use core::num::{NonZeroI128, NonZeroI16, NonZeroI32, NonZeroI64, NonZeroI8, #[stable(feature = "nonzero", since = "1.28.0")] pub use core::num::{NonZeroU128, NonZeroU16, NonZeroU32, NonZeroU64, NonZeroU8, NonZeroUsize}; -#[unstable( - feature = "int_error_matching", - reason = "it can be useful to match errors when making error messages \ - for integer parsing", - issue = "22639" -)] +#[stable(feature = "int_error_matching", since = "1.55.0")] pub use core::num::IntErrorKind; #[cfg(test)] |