Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 4 additions & 11 deletions library/std/src/path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ where
}

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

Expand Down Expand Up @@ -2155,7 +2155,7 @@ impl Path {
unsafe { Path::new(OsStr::from_encoded_bytes_unchecked(s)) }
}
// The following (private!) function reveals the byte encoding used for OsStr.
fn as_u8_slice(&self) -> &[u8] {
pub(crate) fn as_u8_slice(&self) -> &[u8] {
self.inner.as_encoded_bytes()
}

Expand Down Expand Up @@ -2323,14 +2323,7 @@ impl Path {
#[must_use]
#[allow(deprecated)]
pub fn is_absolute(&self) -> bool {
if cfg!(target_os = "redox") {
// FIXME: Allow Redox prefixes
self.has_root() || has_redox_scheme(self.as_u8_slice())
} else {
self.has_root()
&& (cfg!(any(unix, target_os = "hermit", target_os = "wasi"))
|| self.prefix().is_some())
}
sys::path::is_absolute(self)
}

/// Returns `true` if the `Path` is relative, i.e., not absolute.
Expand All @@ -2353,7 +2346,7 @@ impl Path {
!self.is_absolute()
}

fn prefix(&self) -> Option<Prefix<'_>> {
pub(crate) fn prefix(&self) -> Option<Prefix<'_>> {
self.components().prefix
}

Expand Down
4 changes: 4 additions & 0 deletions library/std/src/sys/path/sgx.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,7 @@ pub const MAIN_SEP: char = '/';
pub(crate) fn absolute(_path: &Path) -> io::Result<PathBuf> {
unsupported()
}

pub(crate) fn is_absolute(path: &Path) -> bool {
path.has_root() && path.prefix().is_some()
}
11 changes: 11 additions & 0 deletions library/std/src/sys/path/unix.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,3 +60,14 @@ pub(crate) fn absolute(path: &Path) -> io::Result<PathBuf> {

Ok(normalized)
}

pub(crate) fn is_absolute(path: &Path) -> bool {
if cfg!(target_os = "redox") {
// FIXME: Allow Redox prefixes
path.has_root() || crate::path::has_redox_scheme(path.as_u8_slice())
} else if cfg!(any(unix, target_os = "hermit", target_os = "wasi")) {
path.has_root()
} else {
path.has_root() && path.prefix().is_some()
}
}
4 changes: 4 additions & 0 deletions library/std/src/sys/path/unsupported_backslash.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,3 +24,7 @@ pub const MAIN_SEP: char = '\\';
pub(crate) fn absolute(_path: &Path) -> io::Result<PathBuf> {
unsupported()
}

pub(crate) fn is_absolute(path: &Path) -> bool {
path.has_root() && path.prefix().is_some()
}
4 changes: 4 additions & 0 deletions library/std/src/sys/path/windows.rs
Original file line number Diff line number Diff line change
Expand Up @@ -346,3 +346,7 @@ pub(crate) fn absolute(path: &Path) -> io::Result<PathBuf> {
os2path,
)
}

pub(crate) fn is_absolute(path: &Path) -> bool {
path.has_root() && path.prefix().is_some()
}
Loading