@@ -176,7 +176,7 @@ fn list_dir_sorted(path: &Path) -> Option<Vec<Path>> {
176
176
match fs:: readdir ( path) {
177
177
Ok ( mut children) => {
178
178
children. sort_by ( |p1, p2| p2. filename ( ) . cmp ( & p1. filename ( ) ) ) ;
179
- Some ( children. move_iter ( ) . collect ( ) )
179
+ Some ( children. into_iter ( ) . collect ( ) )
180
180
}
181
181
Err ( ..) => None
182
182
}
@@ -297,12 +297,12 @@ impl Pattern {
297
297
match c {
298
298
// note that ! does not need escaping because it is only special inside brackets
299
299
'?' | '*' | '[' | ']' => {
300
- escaped. push_char ( '[' ) ;
301
- escaped. push_char ( c) ;
302
- escaped. push_char ( ']' ) ;
300
+ escaped. push ( '[' ) ;
301
+ escaped. push ( c) ;
302
+ escaped. push ( ']' ) ;
303
303
}
304
304
c => {
305
- escaped. push_char ( c) ;
305
+ escaped. push ( c) ;
306
306
}
307
307
}
308
308
}
@@ -441,7 +441,7 @@ fn fill_todo(todo: &mut Vec<(Path, uint)>, patterns: &[Pattern], idx: uint, path
441
441
let mut s = String :: new ( ) ;
442
442
for token in pattern. tokens . iter ( ) {
443
443
match * token {
444
- Char ( c) => s. push_char ( c) ,
444
+ Char ( c) => s. push ( c) ,
445
445
_ => return None
446
446
}
447
447
}
@@ -477,7 +477,7 @@ fn fill_todo(todo: &mut Vec<(Path, uint)>, patterns: &[Pattern], idx: uint, path
477
477
None => {
478
478
match list_dir_sorted ( path) {
479
479
Some ( entries) => {
480
- todo. extend ( entries. move_iter ( ) . map ( |x|( x, idx) ) ) ;
480
+ todo. extend ( entries. into_iter ( ) . map ( |x|( x, idx) ) ) ;
481
481
482
482
// Matching the special directory entries . and .. that refer to
483
483
// the current and parent directory respectively requires that
0 commit comments