user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switch to using Prefix::Verbatim

Browse source
This commit is contained in:
Jeremy Soller 2016-11-28 18:19:17 -07:00
parent 746222fd9d
commit 2ec21327f2
2 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libstd/path.rs
View file

@ -148,10 +148,6 @@ use sys::path::{is_sep_byte, is_verbatim_sep, MAIN_SEP_STR, parse_prefix};
#[derive(Copy, Clone, Debug, Hash, PartialOrd, Ord, PartialEq, Eq)]
#[stable(feature = "rust1", since = "1.0.0")]
pub enum Prefix<'a> {
/// Prefix `scheme:`, where `scheme` is the component stored
#[unstable(feature="redox_prefix", issue="0")]
Scheme(&'a OsStr),
/// Prefix `\\?\`, together with the given component immediately following it.
#[stable(feature = "rust1", since = "1.0.0")]
Verbatim(#[stable(feature = "rust1", since = "1.0.0")] &'a OsStr),
@ -191,7 +187,9 @@ impl<'a> Prefix<'a> {
os_str_as_u8_slice(s).len()
}
match *self {
Scheme(x) => os_str_len(x) + 1,
#[cfg(target_os = "redox")]
Verbatim(x) => 1 + os_str_len(x),
#[cfg(not(target_os = "redox"))]
Verbatim(x) => 4 + os_str_len(x),
VerbatimUNC(x, y) => {
8 + os_str_len(x) +

2
src/libstd/sys/redox/path.rs
View file

@ -24,7 +24,7 @@ pub fn is_verbatim_sep(b: u8) -> bool {
pub fn parse_prefix(path: &OsStr) -> Option<Prefix> {
if let Some(path_str) = path.to_str() {
if let Some(i) = path_str.find(':') {
Some(Prefix::Scheme(OsStr::new(&path_str[..i])))
Some(Prefix::Verbatim(OsStr::new(&path_str[..i])))
} else {
None
}