diff options
| author | bors <bors@rust-lang.org> | 2019-04-17 22:24:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-17 22:24:11 +0000 |
| commit | 9387927ae2c0d2a283f6c48b705f25d38bb6e692 (patch) | |
| tree | 64cc8bae3fa87a8a581b6d73e3bbee7802167d4d /src/liballoc | |
| parent | 3c3d3c1777041200bb7ed7a65b6562d62899778c (diff) | |
| parent | 42b3cf107d8352d48de35f7caa76946a1b64e962 (diff) | |
| download | rust-9387927ae2c0d2a283f6c48b705f25d38bb6e692.tar.gz rust-9387927ae2c0d2a283f6c48b705f25d38bb6e692.zip | |
Auto merge of #60054 - Centril:rollup-o40xxaa, r=Centril
Rollup of 4 pull requests
Successful merges:
- #59908 (Re-export core::str::{EscapeDebug, EscapeDefault, EscapeUnicode} in std)
- #59984 (Remove collection-specific `with_capacity` documentation from `std::collections`)
- #60036 (Remove nrc from toolstate pings)
- #60037 (Resolve inconsistency in error messages between "parameter" and "variable".)
Failed merges:
r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/str.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/liballoc/str.rs b/src/liballoc/str.rs index a36804bddff..f10a01d44c8 100644 --- a/src/liballoc/str.rs +++ b/src/liballoc/str.rs @@ -68,6 +68,8 @@ pub use core::str::pattern; pub use core::str::EncodeUtf16; #[stable(feature = "split_ascii_whitespace", since = "1.34.0")] pub use core::str::SplitAsciiWhitespace; +#[stable(feature = "str_escape", since = "1.34.0")] +pub use core::str::{EscapeDebug, EscapeDefault, EscapeUnicode}; #[unstable(feature = "slice_concat_ext", reason = "trait should not have to exist", |