Skip to content

Commit 29bef00

Browse files
committed
Merge pull request #37 from andersk/io-error
Update for stabilized io::Error
2 parents 18b7102 + 016cc09 commit 29bef00

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
2424
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2525
html_root_url = "http://doc.rust-lang.org/glob/")]
26-
#![feature(convert)]
2726
#![cfg_attr(all(test, windows), feature(std_misc))]
2827

2928
use std::ascii::AsciiExt;
@@ -239,7 +238,7 @@ impl fmt::Display for GlobError {
239238
}
240239

241240
fn is_dir(p: &Path) -> bool {
242-
fs::metadata(p).map(|m| m.is_dir()) == Ok(true)
241+
fs::metadata(p).map(|m| m.is_dir()).unwrap_or(false)
243242
}
244243

245244
/// An alias for a glob iteration result.

tests/glob-std.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// ignore-windows TempDir may cause IoError on windows: #10462
1212

13-
#![feature(convert)]
1413
#![cfg_attr(test, deny(warnings))]
1514

1615
extern crate glob;

0 commit comments

Comments
 (0)