diff options
| author | bors <bors@rust-lang.org> | 2017-07-01 11:21:53 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-01 11:21:53 +0000 |
| commit | a5d34e1d035e5441fb5b3d56d5205d038538f053 (patch) | |
| tree | 7332309577b58d4917a07e9b2ea8d8d5c4b43cc0 /src/liballoc/string.rs | |
| parent | 7a2c09b6f5282335fc0000f5504fbed2f70e89c8 (diff) | |
| parent | 0a9c13624d2fede5c6ce8e5aa7f486403098bde6 (diff) | |
| download | rust-a5d34e1d035e5441fb5b3d56d5205d038538f053.tar.gz rust-a5d34e1d035e5441fb5b3d56d5205d038538f053.zip | |
Auto merge of #42991 - sfackler:unstable-rangeargument, r=alexcrichton
Revert "Stabilize RangeArgument" This reverts commit 143206d54d7558c2326212df99efc98110904fdb. From the discussion in #30877 it seems like this is premature.
Diffstat (limited to 'src/liballoc/string.rs')
| -rw-r--r-- | src/liballoc/string.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs index 1f0894d39d4..79d1ccf637d 100644 --- a/src/liballoc/string.rs +++ b/src/liballoc/string.rs @@ -59,14 +59,15 @@ use core::fmt; use core::hash; use core::iter::{FromIterator, FusedIterator}; -use core::ops::{self, Add, AddAssign, Index, IndexMut, RangeArgument}; -use core::ops::Bound::{Excluded, Included, Unbounded}; +use core::ops::{self, Add, AddAssign, Index, IndexMut}; use core::ptr; use core::str::pattern::Pattern; use std_unicode::lossy; use std_unicode::char::{decode_utf16, REPLACEMENT_CHARACTER}; use borrow::{Cow, ToOwned}; +use range::RangeArgument; +use Bound::{Excluded, Included, Unbounded}; use str::{self, from_boxed_utf8_unchecked, FromStr, Utf8Error, Chars}; use vec::Vec; use boxed::Box; |
