diff options
| author | bors <bors@rust-lang.org> | 2013-08-29 11:10:47 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-08-29 11:10:47 -0700 |
| commit | a6835dd3cb1abaf3e8699e58b99e2ecb43611414 (patch) | |
| tree | 811b949ca5bc36f3a39997a18220ba42917b7845 /src/libstd/rt | |
| parent | 58c3fa92eda837cdb9be2ad206d7efd3fe402110 (diff) | |
| parent | dc30005ad8723ac1ace05340622c51ea9d6a3fd6 (diff) | |
| download | rust-a6835dd3cb1abaf3e8699e58b99e2ecb43611414.tar.gz rust-a6835dd3cb1abaf3e8699e58b99e2ecb43611414.zip | |
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/rt')
| -rw-r--r-- | src/libstd/rt/comm.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/sched.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/rt/comm.rs b/src/libstd/rt/comm.rs index 4b1881409f4..4f5f26513b4 100644 --- a/src/libstd/rt/comm.rs +++ b/src/libstd/rt/comm.rs @@ -718,7 +718,7 @@ mod test { use option::*; use rt::test::*; use cell::Cell; - use iter::Times; + use num::Times; use rt::util; #[test] diff --git a/src/libstd/rt/sched.rs b/src/libstd/rt/sched.rs index b393832871d..6aa66a6ab6b 100644 --- a/src/libstd/rt/sched.rs +++ b/src/libstd/rt/sched.rs @@ -1114,7 +1114,7 @@ mod test { #[test] fn multithreading() { use rt::comm::*; - use iter::Times; + use num::Times; use vec::OwnedVector; use container::Container; |
