diff options
| author | bors <bors@rust-lang.org> | 2018-03-06 15:01:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-03-06 15:01:21 +0000 |
| commit | 2789b067da2ac921b86199bde21dd231ace1da39 (patch) | |
| tree | d39a80c2778ced0f9437ade7f4e76ef51e364bfa /src/libstd_unicode | |
| parent | b977e044a7485a95852bfce12f1054bcc673355d (diff) | |
| parent | 8e3493d45924fdb869c37dcb992759f71defed7c (diff) | |
| download | rust-2789b067da2ac921b86199bde21dd231ace1da39.tar.gz rust-2789b067da2ac921b86199bde21dd231ace1da39.zip | |
Auto merge of #48768 - kennytm:rollup, r=kennytm
Rollup of 14 pull requests - Successful merges: #48403, #48432, #48546, #48573, #48590, #48657, #48727, #48732, #48753, #48754, #48761, #48474, #48507, #47463 - Failed merges:
Diffstat (limited to 'src/libstd_unicode')
| -rw-r--r-- | src/libstd_unicode/char.rs | 4 | ||||
| -rw-r--r-- | src/libstd_unicode/lib.rs | 1 | ||||
| -rw-r--r-- | src/libstd_unicode/u_str.rs | 3 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/libstd_unicode/char.rs b/src/libstd_unicode/char.rs index 5dd9c627750..de8b46d5f1b 100644 --- a/src/libstd_unicode/char.rs +++ b/src/libstd_unicode/char.rs @@ -70,7 +70,7 @@ impl Iterator for ToLowercase { } } -#[unstable(feature = "fused", issue = "35602")] +#[stable(feature = "fused", since = "1.26.0")] impl FusedIterator for ToLowercase {} /// Returns an iterator that yields the uppercase equivalent of a `char`. @@ -92,7 +92,7 @@ impl Iterator for ToUppercase { } } -#[unstable(feature = "fused", issue = "35602")] +#[stable(feature = "fused", since = "1.26.0")] impl FusedIterator for ToUppercase {} #[derive(Debug, Clone)] diff --git a/src/libstd_unicode/lib.rs b/src/libstd_unicode/lib.rs index dcae7d0af40..f155b62e3cc 100644 --- a/src/libstd_unicode/lib.rs +++ b/src/libstd_unicode/lib.rs @@ -36,7 +36,6 @@ #![feature(str_internals)] #![feature(decode_utf8)] #![feature(fn_traits)] -#![feature(fused)] #![feature(lang_items)] #![feature(non_exhaustive)] #![feature(staged_api)] diff --git a/src/libstd_unicode/u_str.rs b/src/libstd_unicode/u_str.rs index 5d1611acb7e..a72e1210d93 100644 --- a/src/libstd_unicode/u_str.rs +++ b/src/libstd_unicode/u_str.rs @@ -127,7 +127,6 @@ impl<I> Iterator for Utf16Encoder<I> } } -#[unstable(feature = "fused", issue = "35602")] impl<I> FusedIterator for Utf16Encoder<I> where I: FusedIterator<Item = char> {} @@ -186,5 +185,5 @@ impl<'a> DoubleEndedIterator for SplitWhitespace<'a> { } } -#[unstable(feature = "fused", issue = "35602")] +#[stable(feature = "fused", since = "1.26.0")] impl<'a> FusedIterator for SplitWhitespace<'a> {} |
