Auto merge of #38935 - redox-os:fix_path_redox, r=brson

bors · bors · commit b4c0207148f5 · 2017-01-14T11:03:25.000Z
Fix is_absolute on Redox

Due to not using prefixes on Redox, yet, it must be added as an exception to Path::is_absolute.
diff --git a/src/libstd/path.rs b/src/libstd/path.rs
@@ -1508,7 +1508,8 @@ impl Path {
     #[stable(feature = "rust1", since = "1.0.0")]
     #[allow(deprecated)]
     pub fn is_absolute(&self) -> bool {
-        self.has_root() && (cfg!(unix) || self.prefix().is_some())
+        // FIXME: Remove target_os = "redox" and allow Redox prefixes
+        self.has_root() && (cfg!(unix) || cfg!(target_os = "redox") || self.prefix().is_some())
     }
 
     /// A path is *relative* if it is not absolute.

Original file line number	Diff line number	Diff line change
`@@ -1508,7 +1508,8 @@ impl Path {`
`1508`	`1508`	`#[stable(feature = "rust1", since = "1.0.0")]`
`1509`	`1509`	`#[allow(deprecated)]`
`1510`	`1510`	`pub fn is_absolute(&self) -> bool {`
`1511`		`- self.has_root() && (cfg!(unix) \|\| self.prefix().is_some())`
	`1511`	`+ // FIXME: Remove target_os = "redox" and allow Redox prefixes`
	`1512`	`+ self.has_root() && (cfg!(unix) \|\| cfg!(target_os = "redox") \|\| self.prefix().is_some())`
`1512`	`1513`	`}`
`1513`	`1514`
`1514`	`1515`	`/// A path is relative if it is not absolute.`