From f41d5b3f8fafe5e31aa29f76085900b4bbc31750 Mon Sep 17 00:00:00 2001 From: Joseph Crail Date: Fri, 31 Jul 2015 14:05:38 -0400 Subject: [PATCH] Replace unstable fs:walk_dir() w/ external crate. --- deps/Cargo.toml | 1 + src/chmod/chmod.rs | 6 +++--- src/chmod/deps.mk | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/deps/Cargo.toml b/deps/Cargo.toml index e220f7ebd..2851d83a3 100644 --- a/deps/Cargo.toml +++ b/deps/Cargo.toml @@ -20,3 +20,4 @@ unicode-width = "0.1.1" winapi = "0.2" advapi32-sys = "0.1" kernel32-sys = "0.1" +walker = "^1.0.0" diff --git a/src/chmod/chmod.rs b/src/chmod/chmod.rs index 921ab8b47..958e56390 100644 --- a/src/chmod/chmod.rs +++ b/src/chmod/chmod.rs @@ -1,5 +1,4 @@ #![crate_name = "chmod"] -#![feature(fs_walk)] /* * This file is part of the uutils coreutils package. @@ -18,14 +17,15 @@ extern crate libc; extern crate memchr; extern crate regex; extern crate regex_syntax; +extern crate walker; use getopts::Options; use regex::Regex; use std::ffi::CString; -use std::fs; use std::io::{Error, Write}; use std::mem; use std::path::Path; +use walker::Walker; #[path = "../common/util.rs"] #[macro_use] @@ -158,7 +158,7 @@ fn chmod(files: Vec, changes: bool, quiet: bool, verbose: bool, preserve if file.uu_is_dir() { if !preserve_root || filename != "/" { if recursive { - let walk_dir = match fs::walk_dir(&file) { + let walk_dir = match Walker::new(&file) { Ok(m) => m, Err(f) => { crash!(1, "{}", f.to_string()); diff --git a/src/chmod/deps.mk b/src/chmod/deps.mk index 78a05f8b6..07a0616b6 100644 --- a/src/chmod/deps.mk +++ b/src/chmod/deps.mk @@ -1 +1 @@ -DEPLIBS += aho-corasick memchr regex regex-syntax +DEPLIBS += aho-corasick memchr regex regex-syntax walker