---

yaml
---
r: 83146
b: refs/heads/auto
c: d108a22
h: refs/heads/master
v: v3

Author: lilyball

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 6eade9e9143e496167d66298e8bbac5d9dfa3e19
+refs/heads/auto: d108a22fd1b38c108e2b9b6cd7276d953524ffa2
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/path/posix.rs

@@ -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!("..");
 

branches/auto/src/libstd/path/windows.rs

@@ -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;