diff options
| author | bors <bors@rust-lang.org> | 2017-11-13 09:13:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-11-13 09:13:00 +0000 |
| commit | e312c8a8c3ecd7fead1e8a6cc591360dc73c9e79 (patch) | |
| tree | f89bad69d8c6b8ca6bbddb12c16ab8d9adf9e2b7 /src/libstd/path.rs | |
| parent | c8c1424bf44d2dfa5b18dd2a85ee5106919c709d (diff) | |
| parent | 48d2627c38e014f5372d1a642bc21e5506fe83f3 (diff) | |
| download | rust-e312c8a8c3ecd7fead1e8a6cc591360dc73c9e79.tar.gz rust-e312c8a8c3ecd7fead1e8a6cc591360dc73c9e79.zip | |
Auto merge of #45956 - kennytm:rollup, r=kennytm
Rollup of 9 pull requests - Successful merges: #45828, #45892, #45893, #45914, #45917, #45927, #45933, #45952, #45954 - Failed merges:
Diffstat (limited to 'src/libstd/path.rs')
| -rw-r--r-- | src/libstd/path.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libstd/path.rs b/src/libstd/path.rs index 270878dc029..69922470cff 100644 --- a/src/libstd/path.rs +++ b/src/libstd/path.rs @@ -1690,11 +1690,11 @@ impl Path { #[stable(feature = "rust1", since = "1.0.0")] #[allow(deprecated)] pub fn is_absolute(&self) -> bool { - if !cfg!(target_os = "redox") { - self.has_root() && (cfg!(unix) || self.prefix().is_some()) - } else { + if cfg!(target_os = "redox") { // FIXME: Allow Redox prefixes - has_redox_scheme(self.as_u8_slice()) + self.has_root() || has_redox_scheme(self.as_u8_slice()) + } else { + self.has_root() && (cfg!(unix) || self.prefix().is_some()) } } |