diff options
| author | Jeff Olson <olson.jeffery@gmail.com> | 2013-09-16 23:39:33 -0700 |
|---|---|---|
| committer | Jeff Olson <olson.jeffery@gmail.com> | 2013-09-16 23:39:33 -0700 |
| commit | c0ec40f74bd33317fb0af76a68d29bfbaf211b58 (patch) | |
| tree | f4de736ce07948a829d37e2a070e5287c558ae09 /src/libstd | |
| parent | 95ef1f54153095d7287ac1ca4209cdef4635ab0e (diff) | |
| download | rust-c0ec40f74bd33317fb0af76a68d29bfbaf211b58.tar.gz rust-c0ec40f74bd33317fb0af76a68d29bfbaf211b58.zip | |
std: merge conflict cleanup from std::str
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/str.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 7cbc88ed204..93cac8797bb 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -22,7 +22,6 @@ use char; use char::Char; use clone::{Clone, DeepClone}; use container::{Container, Mutable}; -use num::Times; use iter::{Iterator, FromIterator, Extendable, range}; use iter::{Filter, AdditiveIterator, Map}; use iter::{Invert, DoubleEndedIterator, ExactSize}; |