about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2016-05-30 20:35:47 +0530
committerManish Goregaokar <manishsmail@gmail.com>2016-05-30 20:35:47 +0530
commit5ef7c43a766b646953ec8b378b7c9f890f9f37da (patch)
treed2f9a33ba4f16b6b3a2d11da39f247dec88a7d04 /src/libstd
parent066fc8d9a694873f33add87b1343f7e4d3a6ec19 (diff)
parent048f37254c1bb029f23ffee5658987ba5126528f (diff)
downloadrust-5ef7c43a766b646953ec8b378b7c9f890f9f37da.tar.gz
rust-5ef7c43a766b646953ec8b378b7c9f890f9f37da.zip
Rollup merge of #33958 - kennytm:patch-1, r=GuillaumeGomez
Use Path::is_dir() in fs::read_dir()'s example.

Basically reverts #25508. The `is_dir()` function has been stable since 1.5.0.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/fs.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs
index 125170bd47b..734f774043d 100644
--- a/src/libstd/fs.rs
+++ b/src/libstd/fs.rs
@@ -1338,10 +1338,10 @@ pub fn remove_dir_all<P: AsRef<Path>>(path: P) -> io::Result<()> {
 ///
 /// // one possible implementation of walking a directory only visiting files
 /// fn visit_dirs(dir: &Path, cb: &Fn(&DirEntry)) -> io::Result<()> {
-///     if try!(fs::metadata(dir)).is_dir() {
+///     if dir.is_dir() {
 ///         for entry in try!(fs::read_dir(dir)) {
 ///             let entry = try!(entry);
-///             if try!(fs::metadata(entry.path())).is_dir() {
+///             if try!(entry.file_type()).is_dir() {
 ///                 try!(visit_dirs(&entry.path(), cb));
 ///             } else {
 ///                 cb(&entry);