about summary refs log tree commit diff
path: root/src/libstd/str.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-08-29 11:10:47 -0700
committerbors <bors@rust-lang.org>2013-08-29 11:10:47 -0700
commita6835dd3cb1abaf3e8699e58b99e2ecb43611414 (patch)
tree811b949ca5bc36f3a39997a18220ba42917b7845 /src/libstd/str.rs
parent58c3fa92eda837cdb9be2ad206d7efd3fe402110 (diff)
parentdc30005ad8723ac1ace05340622c51ea9d6a3fd6 (diff)
auto merge of #8842 : jfager/rust/remove-iter-module, r=pnkfelix
Moves the Times trait to num while the question of whether it should
exist at all gets hashed out as a completely separate question.
Diffstat (limited to 'src/libstd/str.rs')
-rw-r--r--src/libstd/str.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/str.rs b/src/libstd/str.rs
index 9ca6e8ad089..feca2db6705 100644
--- a/src/libstd/str.rs
+++ b/src/libstd/str.rs
@@ -21,7 +21,7 @@ use char;
 use char::Char;
 use clone::{Clone, DeepClone};
 use container::{Container, Mutable};
-use iter::Times;
+use num::Times;
 use iterator::{Iterator, FromIterator, Extendable};
 use iterator::{Filter, AdditiveIterator, Map};
 use iterator::{Invert, DoubleEndedIterator};