diff options
| author | bors <bors@rust-lang.org> | 2018-06-27 23:41:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-06-27 23:41:23 +0000 |
| commit | 266afeb17c993f83d01d8129e97981a57bb442e0 (patch) | |
| tree | 9674856da47b18f31a9b7918ce89a6e6163f43c7 /src/liballoc | |
| parent | cd494c1f0915da00a63c03454a96d504afe764ff (diff) | |
| parent | 99a0d6bf0e478f7ad0dd06ccf2c4d83da69d3167 (diff) | |
| download | rust-266afeb17c993f83d01d8129e97981a57bb442e0.tar.gz rust-266afeb17c993f83d01d8129e97981a57bb442e0.zip | |
Auto merge of #51859 - kennytm:rollup, r=kennytm
Rollup of 7 pull requests Successful merges: - #49987 (Add str::split_ascii_whitespace.) - #50342 (Document round-off error in `.mod_euc()`-method, see issue #50179) - #51658 (Only do sanity check with debug assertions on) - #51799 (Lower case some feature gate error messages) - #51800 (Add a compiletest header for edition) - #51824 (Fix the error reference for LocalKey::try_with) - #51842 (Document that Layout::from_size_align does not allow align=0) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/lib.rs | 1 | ||||
| -rw-r--r-- | src/liballoc/str.rs | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index e25742a4a61..ec9b5eba561 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -108,6 +108,7 @@ #![cfg_attr(stage0, feature(repr_transparent))] #![feature(rustc_attrs)] #![feature(specialization)] +#![feature(split_ascii_whitespace)] #![feature(staged_api)] #![feature(str_internals)] #![feature(trusted_len)] diff --git a/src/liballoc/str.rs b/src/liballoc/str.rs index 32ca8d1fa5e..ec9c39c916c 100644 --- a/src/liballoc/str.rs +++ b/src/liballoc/str.rs @@ -78,6 +78,8 @@ pub use core::str::SplitWhitespace; pub use core::str::pattern; #[stable(feature = "encode_utf16", since = "1.8.0")] pub use core::str::EncodeUtf16; +#[unstable(feature = "split_ascii_whitespace", issue = "48656")] +pub use core::str::SplitAsciiWhitespace; #[unstable(feature = "slice_concat_ext", reason = "trait should not have to exist", |