diff options
| author | bors <bors@rust-lang.org> | 2013-09-09 00:26:07 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-09-09 00:26:07 -0700 |
| commit | d09f569aac99a4ef2f577d288d547504e3dcf588 (patch) | |
| tree | 339ac953153d71da8730569b8bd26b41dc081539 /src/test | |
| parent | eae327032c775813eeb101233a4f7df24eab0a6a (diff) | |
| parent | 6919cf5fe14701621437fcb57f3a0c38fb394c65 (diff) | |
| download | rust-d09f569aac99a4ef2f577d288d547504e3dcf588.tar.gz rust-d09f569aac99a4ef2f577d288d547504e3dcf588.zip | |
auto merge of #9065 : thestinger/rust/iter, r=alexcrichton
The trait will keep the `Iterator` naming, but a more concise module name makes using the free functions less verbose. The module will define iterables in addition to iterators, as it deals with iteration in general.
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/auxiliary/nested_item.rs | 2 | ||||
| -rw-r--r-- | src/test/run-pass/unfold-cross-crate.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/auxiliary/nested_item.rs b/src/test/auxiliary/nested_item.rs index e9dde0d14a3..c2f38134d1e 100644 --- a/src/test/auxiliary/nested_item.rs +++ b/src/test/auxiliary/nested_item.rs @@ -26,7 +26,7 @@ impl<T> Foo { // issue 8134 pub struct Parser<T>; -impl<T: std::iterator::Iterator<char>> Parser<T> { +impl<T: std::iter::Iterator<char>> Parser<T> { fn in_doctype(&mut self) { static DOCTYPEPattern: [char, ..6] = ['O', 'C', 'T', 'Y', 'P', 'E']; } diff --git a/src/test/run-pass/unfold-cross-crate.rs b/src/test/run-pass/unfold-cross-crate.rs index 64cf3077c53..42e680d95e1 100644 --- a/src/test/run-pass/unfold-cross-crate.rs +++ b/src/test/run-pass/unfold-cross-crate.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::iterator::*; +use std::iter::*; // Unfold had a bug with 'self that mean it didn't work // cross-crate |