bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

path2: Update for privacy changes

Browse source 
Remove redundant `contains_nul` definition.

Make `parse_prefix` private.
This commit is contained in:
Kevin Ballard 2013-10-16 09:55:55 -07:00
parent 6eade9e914
commit d108a22fd1
2 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstd/path/posix.rs
View file

@ -439,12 +439,6 @@ fn normalize_helper<'a>(v: &'a [u8], is_abs: bool) -> Option<~[&'a [u8]]> {
}
}
// FIXME (#8169): Pull this into parent module once visibility works
#[inline(always)]
fn contains_nul(v: &[u8]) -> bool {
v.iter().any(|&x| x == 0)
}
static dot_static: &'static [u8] = bytes!(".");
static dot_dot_static: &'static [u8] = bytes!("..");

12
src/libstd/path/windows.rs
View file

@ -21,7 +21,7 @@ use str;
use str::{CharSplitIterator, OwnedStr, Str, StrVector};
use to_bytes::IterBytes;
use vec::Vector;
use super::{BytesContainer, GenericPath, GenericPathUnsafe};
use super::{contains_nul, BytesContainer, GenericPath, GenericPathUnsafe};
#[cfg(target_os = "win32")]
use libc;
@ -922,9 +922,8 @@ pub enum PathPrefix {
DiskPrefix
}
/// Internal function; only public for tests. Don't use.
// FIXME (#8169): Make private once visibility is fixed
pub fn parse_prefix<'a>(mut path: &'a str) -> Option<PathPrefix> {
fn parse_prefix<'a>(mut path: &'a str) -> Option<PathPrefix> {
if path.starts_with("\\\\") {
// \\
path = path.slice_from(2);
@ -1032,12 +1031,6 @@ fn normalize_helper<'a>(s: &'a str, prefix: Option<PathPrefix>) -> (bool,Option<
}
}
// FIXME (#8169): Pull this into parent module once visibility works
#[inline(always)]
fn contains_nul(v: &[u8]) -> bool {
v.iter().any(|&x| x == 0)
}
fn prefix_is_verbatim(p: Option<PathPrefix>) -> bool {
match p {
Some(VerbatimPrefix(_)) | Some(VerbatimUNCPrefix(_,_)) | Some(VerbatimDiskPrefix) => true,
@ -1136,6 +1129,7 @@ impl Path {
#[cfg(test)]
mod tests {
use super::*;
use super::parse_prefix;
use option::{Some,None};
use iter::Iterator;
use vec::Vector;