Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Redox: correct is_absolute() and has_root() #43983

Merged
merged 4 commits into from Aug 23, 2017
Merged

Redox: correct is_absolute() and has_root() #43983

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b272f6c
redox: Require scheme for path to be absolute
ids1024 Aug 18, 2017
e0f0fd0
Correct has_root() on Redox
ids1024 Aug 18, 2017
ab48de8
Use cfg! instead of #[cfg]
ids1024 Aug 22, 2017
fe2d661
Simplify code for handling Redox paths
ids1024 Aug 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/libstd/path.rs
View file
Open in desktop
Expand Up @@ -323,6 +323,11 @@ unsafe fn u8_slice_as_os_str(s: &[u8]) -> &OsStr {
mem::transmute(s)
}

// Detect scheme on Redox
fn has_redox_scheme(s: &[u8]) -> bool {
cfg!(target_os = "redox") && s.split(|b| *b == b'/').next().unwrap_or(b"").contains(&b':')
}

////////////////////////////////////////////////////////////////////////////////
// Cross-platform, iterator-independent parsing
////////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -1685,8 +1690,12 @@ impl Path {
#[stable(feature = "rust1", since = "1.0.0")]
#[allow(deprecated)]
pub fn is_absolute(&self) -> bool {
// FIXME: Remove target_os = "redox" and allow Redox prefixes
self.has_root() && (cfg!(unix) || cfg!(target_os = "redox") || self.prefix().is_some())
if !cfg!(target_os = "redox") {
self.has_root() && (cfg!(unix) || self.prefix().is_some())
} else {
// FIXME: Allow Redox prefixes
has_redox_scheme(self.as_u8_slice())
}
}

/// Returns `true` if the `Path` is relative, i.e. not absolute.
Expand Down Expand Up @@ -2050,7 +2059,8 @@ impl Path {
Components {
path: self.as_u8_slice(),
prefix,
has_physical_root: has_physical_root(self.as_u8_slice(), prefix),
has_physical_root: has_physical_root(self.as_u8_slice(), prefix) ||
has_redox_scheme(self.as_u8_slice()),
front: State::Prefix,
back: State::Body,
}
Expand Down