rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove has_redox_scheme

Browse Source 
Redox OS is moving away from name:/path style paths to /scheme/name/path
style paths which are already handled correctly without has_redox_scheme.
This commit is contained in:
bjorn3
2025-03-13 20:09:07 +00:00
parent 83ee034d03
commit 43499bfe2e
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/std/src/path.rs
View File

@@ -294,11 +294,6 @@ where
} }
} }
// Detect scheme on Redox
pub(crate) fn has_redox_scheme(s: &[u8]) -> bool {
cfg!(target_os = "redox") && s.contains(&b':')
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Cross-platform, iterator-independent parsing // Cross-platform, iterator-independent parsing
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@@ -2834,8 +2829,7 @@ impl Path {
Components { Components {
path: self.as_u8_slice(), path: self.as_u8_slice(),
prefix, 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, front: State::Prefix,
back: State::Body, back: State::Body,
} }

5
library/std/src/sys/path/unix.rs
View File

@@ -62,10 +62,7 @@ pub(crate) fn absolute(path: &Path) -> io::Result<PathBuf> {
} }
pub(crate) fn is_absolute(path: &Path) -> bool { pub(crate) fn is_absolute(path: &Path) -> bool {
if cfg!(target_os = "redox") { if cfg!(any(unix, target_os = "hermit", target_os = "wasi")) {
// 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() path.has_root()
} else { } else {
path.has_root() && path.prefix().is_some() path.has_root() && path.prefix().is_some()