From ab48de88472f19596ba2a67ff4e8a8c1c4015989 Mon Sep 17 00:00:00 2001 From: Ian Douglas Scott Date: Tue, 22 Aug 2017 08:17:05 -0700 Subject: [PATCH] Use cfg! instead of #[cfg] --- src/libstd/path.rs | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/libstd/path.rs b/src/libstd/path.rs index 5757d447c54d..32e1781c3c45 100644 --- a/src/libstd/path.rs +++ b/src/libstd/path.rs @@ -327,14 +327,7 @@ unsafe fn u8_slice_as_os_str(s: &[u8]) -> &OsStr { #[inline] #[allow(unused_variables)] fn has_scheme(s: &[u8]) -> bool { - #[cfg(target_os = "redox")] - { - s.split(|b| *b == b'/').next().unwrap_or(b"").contains(&b':') - } - #[cfg(not(target_os = "redox"))] - { - false - } + cfg!(target_os = "redox") && s.split(|b| *b == b'/').next().unwrap_or(b"").contains(&b':') } //////////////////////////////////////////////////////////////////////////////// @@ -1702,12 +1695,9 @@ impl Path { #[stable(feature = "rust1", since = "1.0.0")] #[allow(deprecated)] pub fn is_absolute(&self) -> bool { - #[cfg(not(target_os = "redox"))] - { + if !cfg!(target_os = "redox") { self.has_root() && (cfg!(unix) || self.prefix().is_some()) - } - #[cfg(target_os = "redox")] - { + } else { // FIXME: Allow Redox prefixes has_scheme(self.as_u8_slice()) }