From 8d2b9840b43696472c11c7326a53c4be980b4e28 Mon Sep 17 00:00:00 2001 From: Michal Budzynski Date: Wed, 14 Jun 2017 16:20:18 +0200 Subject: [PATCH] Renamed Iter to IntoIter --- src/lib.rs | 14 +++++++------- src/tests.rs | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 8be0806..479295e 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -326,10 +326,10 @@ impl WalkDir { impl IntoIterator for WalkDir { type Item = Result; - type IntoIter = Iter; + type IntoIter = IntoIter; - fn into_iter(self) -> Iter { - Iter { + fn into_iter(self) -> IntoIter { + IntoIter { opts: self.opts, start: Some(self.root), stack_list: vec![], @@ -433,7 +433,7 @@ pub trait WalkDirIterator: Iterator { /// descriptors and whether the iterator should follow symbolic links. /// /// The order of elements yielded by this iterator is unspecified. -pub struct Iter { +pub struct IntoIter { /// Options specified in the builder. Depths, max fds, etc. opts: WalkDirOptions, /// The start path. @@ -518,7 +518,7 @@ pub struct DirEntry { ino: u64, } -impl Iterator for Iter { +impl Iterator for IntoIter { type Item = Result; fn next(&mut self) -> Option> { @@ -560,7 +560,7 @@ impl Iterator for Iter { } } -impl WalkDirIterator for Iter { +impl WalkDirIterator for IntoIter { fn skip_current_dir(&mut self) { if !self.stack_list.is_empty() { self.stack_list.pop(); @@ -571,7 +571,7 @@ impl WalkDirIterator for Iter { } } -impl Iter { +impl IntoIter { fn handle_entry( &mut self, mut dent: DirEntry, diff --git a/src/tests.rs b/src/tests.rs index 6aa01b3..2239cc7 100644 --- a/src/tests.rs +++ b/src/tests.rs @@ -10,7 +10,7 @@ use std::collections::HashMap; use quickcheck::{Arbitrary, Gen, QuickCheck, StdGen}; use rand::{self, Rng}; -use super::{DirEntry, WalkDir, WalkDirIterator, Iter, Error, ErrorInner}; +use super::{DirEntry, WalkDir, WalkDirIterator, IntoIter, Error, ErrorInner}; #[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)] enum Tree { @@ -272,7 +272,7 @@ enum WalkEvent { struct WalkEventIter { depth: usize, - it: Iter, + it: IntoIter, next: Option>, }