Auto merge of #33965 - Manishearth:rollup, r=Manishearth

Rollup of 5 pull requests

- Successful merges: #33867, #33926, #33942, #33958, #33964
- Failed merges:

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);