itsscb/walkdir
1
0
Fork 0
mirror of https://github.com/BurntSushi/walkdir.git synced 2025-10-02 08:00:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Renamed Iter to IntoIter

Browse Source
This commit is contained in:
Michal Budzynski 2017-06-14 16:20:18 +02:00 committed by Andrew Gallant
parent c43a71f536
commit 8d2b9840b4
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib.rs
View File

@ -326,10 +326,10 @@ impl WalkDir {
impl IntoIterator for WalkDir { impl IntoIterator for WalkDir {
type Item = Result<DirEntry>; type Item = Result<DirEntry>;
type IntoIter = Iter; type IntoIter = IntoIter;
fn into_iter(self) -> Iter { fn into_iter(self) -> IntoIter {
Iter { IntoIter {
opts: self.opts, opts: self.opts,
start: Some(self.root), start: Some(self.root),
stack_list: vec![], stack_list: vec![],
@ -433,7 +433,7 @@ pub trait WalkDirIterator: Iterator {
/// descriptors and whether the iterator should follow symbolic links. /// descriptors and whether the iterator should follow symbolic links.
/// ///
/// The order of elements yielded by this iterator is unspecified. /// 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. /// Options specified in the builder. Depths, max fds, etc.
opts: WalkDirOptions, opts: WalkDirOptions,
/// The start path. /// The start path.
@ -518,7 +518,7 @@ pub struct DirEntry {
ino: u64, ino: u64,
} }
impl Iterator for Iter { impl Iterator for IntoIter {
type Item = Result<DirEntry>; type Item = Result<DirEntry>;
fn next(&mut self) -> Option<Result<DirEntry>> { fn next(&mut self) -> Option<Result<DirEntry>> {
@ -560,7 +560,7 @@ impl Iterator for Iter {
} }
} }
impl WalkDirIterator for Iter { impl WalkDirIterator for IntoIter {
fn skip_current_dir(&mut self) { fn skip_current_dir(&mut self) {
if !self.stack_list.is_empty() { if !self.stack_list.is_empty() {
self.stack_list.pop(); self.stack_list.pop();
@ -571,7 +571,7 @@ impl WalkDirIterator for Iter {
} }
} }
impl Iter { impl IntoIter {
fn handle_entry( fn handle_entry(
&mut self, &mut self,
mut dent: DirEntry, mut dent: DirEntry,

4
src/tests.rs
View File

@ -10,7 +10,7 @@ use std::collections::HashMap;
use quickcheck::{Arbitrary, Gen, QuickCheck, StdGen}; use quickcheck::{Arbitrary, Gen, QuickCheck, StdGen};
use rand::{self, Rng}; 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)] #[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
enum Tree { enum Tree {
@ -272,7 +272,7 @@ enum WalkEvent {
struct WalkEventIter { struct WalkEventIter {
depth: usize, depth: usize,
it: Iter, it: IntoIter,
next: Option<Result<DirEntry, Error>>, next: Option<Result<DirEntry, Error>>,
} }