Provide an implementation of DoubleEndedIterator for the results of &[T]::split and &[T]::rsplit
This makes the splitting functions in std::slice return DoubleEndedIterators. Unfortunately,
splitn and rsplitn cannot provide such an interface and so must return different types. As a
result, the following changes were made:
* RevSplits was removed in favor of explicitly using Rev
* Splits can no longer bound the number of splits done
* Splits now implements DoubleEndedIterator
* SplitsN was added, taking the role of what both Splits and RevSplits used to be
* rsplit returns Rev<Splits<'a, T>> instead of RevSplits<'a, T>
* splitn returns SplitsN<'a, T> instead of Splits<'a, T>
* rsplitn returns SplitsN<'a, T> instead of RevSplits<'a, T>
All functions that were previously implemented on each return value still are, so outside of changing
of type annotations, existing code should work out of the box. In the rare case that code relied
on the return types of split and splitn or of rsplit and rsplitn being the same, the previous
behavior can be emulated by calling splitn or rsplitn with a bount of uint::MAX.
The value of this change comes in multiple parts:
* Consistency. The splitting code in std::str is structured similarly to the new slice splitting code,
having separate CharSplits and CharSplitsN types.
* Smaller API. Although this commit doesn't implement it, using a DoubleEndedIterator for splitting
means that rsplit, path::RevComponents, path::RevStrComponents, Path::rev_components, and
Path::rev_str_components are no longer needed - they can be emulated simply with .rev().
* Power. DoubleEndedIterators are able to traverse the list from both sides at once instead of only
forwards or backwards.
* Efficiency. For the common case of using split instead of splitn, the iterator is slightly smaller
and slightly faster.
[breaking-change]
2014-04-20 21:28:38 -05:00
|
|
|
// Copyright 2013-2014 The Rust Project Developers. See the COPYRIGHT
|
2013-09-01 12:44:07 -07:00
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
|
|
|
//! Windows file path handling
|
|
|
|
|
2013-08-27 00:51:08 -07:00
|
|
|
use ascii::AsciiCast;
|
|
|
|
use c_str::{CString, ToCStr};
|
2014-01-06 16:48:51 -08:00
|
|
|
use clone::Clone;
|
2014-03-22 16:30:45 -04:00
|
|
|
use cmp::{Eq, TotalEq};
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 10:34:51 -07:00
|
|
|
use container::Container;
|
2013-08-27 00:51:08 -07:00
|
|
|
use from_str::FromStr;
|
2014-02-25 08:03:41 -08:00
|
|
|
use io::Writer;
|
2014-05-22 10:40:07 -07:00
|
|
|
use iter::{AdditiveIterator, DoubleEndedIterator, Extendable, Iterator, Map};
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 10:34:51 -07:00
|
|
|
use mem;
|
2013-08-27 00:51:08 -07:00
|
|
|
use option::{Option, Some, None};
|
2014-03-08 18:11:52 -05:00
|
|
|
use slice::{Vector, OwnedVector, ImmutableVector};
|
2014-04-30 23:06:36 -07:00
|
|
|
use str::{CharSplits, Str, StrAllocating, StrVector, StrSlice};
|
2014-05-22 16:57:53 -07:00
|
|
|
use string::String;
|
2014-04-12 20:42:17 +10:00
|
|
|
use vec::Vec;
|
|
|
|
|
2013-10-16 09:55:55 -07:00
|
|
|
use super::{contains_nul, BytesContainer, GenericPath, GenericPathUnsafe};
|
2013-08-27 00:51:08 -07:00
|
|
|
|
2013-09-26 17:21:59 -07:00
|
|
|
/// Iterator that yields successive components of a Path as &str
|
|
|
|
///
|
|
|
|
/// Each component is yielded as Option<&str> for compatibility with PosixPath, but
|
|
|
|
/// every component in WindowsPath is guaranteed to be Some.
|
2014-01-14 22:32:24 -05:00
|
|
|
pub type StrComponents<'a> = Map<'a, &'a str, Option<&'a str>,
|
|
|
|
CharSplits<'a, char>>;
|
2013-09-26 17:21:59 -07:00
|
|
|
|
|
|
|
/// Iterator that yields successive components of a Path as &[u8]
|
2014-01-14 22:32:24 -05:00
|
|
|
pub type Components<'a> = Map<'a, Option<&'a str>, &'a [u8],
|
|
|
|
StrComponents<'a>>;
|
2013-08-27 00:51:08 -07:00
|
|
|
|
|
|
|
/// Represents a Windows path
|
|
|
|
// Notes for Windows path impl:
|
|
|
|
// The MAX_PATH is 260, but 253 is the practical limit due to some API bugs
|
|
|
|
// See http://msdn.microsoft.com/en-us/library/windows/desktop/aa365247.aspx for good information
|
|
|
|
// about windows paths.
|
|
|
|
// That same page puts a bunch of restrictions on allowed characters in a path.
|
|
|
|
// `\foo.txt` means "relative to current drive", but will not be considered to be absolute here
|
|
|
|
// as `∃P | P.join("\foo.txt") != "\foo.txt"`.
|
|
|
|
// `C:` is interesting, that means "the current directory on drive C".
|
|
|
|
// Long absolute paths need to have \\?\ prefix (or, for UNC, \\?\UNC\). I think that can be
|
|
|
|
// ignored for now, though, and only added in a hypothetical .to_pwstr() function.
|
|
|
|
// However, if a path is parsed that has \\?\, this needs to be preserved as it disables the
|
|
|
|
// processing of "." and ".." components and / as a separator.
|
|
|
|
// Experimentally, \\?\foo is not the same thing as \foo.
|
|
|
|
// Also, \\foo is not valid either (certainly not equivalent to \foo).
|
|
|
|
// Similarly, C:\\Users is not equivalent to C:\Users, although C:\Users\\foo is equivalent
|
|
|
|
// to C:\Users\foo. In fact the command prompt treats C:\\foo\bar as UNC path. But it might be
|
|
|
|
// best to just ignore that and normalize it to C:\foo\bar.
|
|
|
|
//
|
|
|
|
// Based on all this, I think the right approach is to do the following:
|
|
|
|
// * Require valid utf-8 paths. Windows API may use WCHARs, but we don't, and utf-8 is convertible
|
|
|
|
// to UTF-16 anyway (though does Windows use UTF-16 or UCS-2? Not sure).
|
|
|
|
// * Parse the prefixes \\?\UNC\, \\?\, and \\.\ explicitly.
|
|
|
|
// * If \\?\UNC\, treat following two path components as server\share. Don't error for missing
|
|
|
|
// server\share.
|
|
|
|
// * If \\?\, parse disk from following component, if present. Don't error for missing disk.
|
|
|
|
// * If \\.\, treat rest of path as just regular components. I don't know how . and .. are handled
|
|
|
|
// here, they probably aren't, but I'm not going to worry about that.
|
|
|
|
// * Else if starts with \\, treat following two components as server\share. Don't error for missing
|
|
|
|
// server\share.
|
|
|
|
// * Otherwise, attempt to parse drive from start of path.
|
|
|
|
//
|
|
|
|
// The only error condition imposed here is valid utf-8. All other invalid paths are simply
|
|
|
|
// preserved by the data structure; let the Windows API error out on them.
|
2014-03-05 01:19:14 -05:00
|
|
|
#[deriving(Clone)]
|
2013-08-27 00:51:08 -07:00
|
|
|
pub struct Path {
|
2014-05-22 16:57:53 -07:00
|
|
|
repr: String, // assumed to never be empty
|
2014-03-27 15:09:47 -07:00
|
|
|
prefix: Option<PathPrefix>,
|
|
|
|
sepidx: Option<uint> // index of the final separator in the non-prefix portion of repr
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Eq for Path {
|
|
|
|
#[inline]
|
|
|
|
fn eq(&self, other: &Path) -> bool {
|
|
|
|
self.repr == other.repr
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-22 16:30:45 -04:00
|
|
|
impl TotalEq for Path {}
|
|
|
|
|
2013-08-27 00:51:08 -07:00
|
|
|
impl FromStr for Path {
|
|
|
|
fn from_str(s: &str) -> Option<Path> {
|
2013-12-03 19:15:12 -08:00
|
|
|
Path::new_opt(s)
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-05 14:15:11 -07:00
|
|
|
// FIXME (#12938): Until DST lands, we cannot decompose &str into & and str, so
|
|
|
|
// we cannot usefully take ToCStr arguments by reference (without forcing an
|
|
|
|
// additional & around &str). So we are instead temporarily adding an instance
|
|
|
|
// for &Path, so that we can take ToCStr as owned. When DST lands, the &Path
|
|
|
|
// instance should be removed, and arguments bound by ToCStr should be passed by
|
|
|
|
// reference.
|
|
|
|
|
2013-08-27 00:51:08 -07:00
|
|
|
impl ToCStr for Path {
|
|
|
|
#[inline]
|
|
|
|
fn to_c_str(&self) -> CString {
|
2014-05-05 14:15:11 -07:00
|
|
|
// The Path impl guarantees no internal NUL
|
|
|
|
unsafe { self.to_c_str_unchecked() }
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
|
|
|
unsafe fn to_c_str_unchecked(&self) -> CString {
|
|
|
|
self.as_vec().to_c_str_unchecked()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-05 14:15:11 -07:00
|
|
|
impl<'a> ToCStr for &'a Path {
|
|
|
|
#[inline]
|
|
|
|
fn to_c_str(&self) -> CString {
|
|
|
|
(*self).to_c_str()
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
|
|
|
unsafe fn to_c_str_unchecked(&self) -> CString {
|
|
|
|
(*self).to_c_str_unchecked()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-10 20:47:25 -07:00
|
|
|
impl<S: Writer> ::hash::Hash<S> for Path {
|
2014-05-16 10:45:16 -07:00
|
|
|
#[cfg(not(test))]
|
2013-09-26 12:58:56 -07:00
|
|
|
#[inline]
|
2014-03-10 20:47:25 -07:00
|
|
|
fn hash(&self, state: &mut S) {
|
|
|
|
self.repr.hash(state)
|
2013-09-26 12:58:56 -07:00
|
|
|
}
|
2014-05-16 10:45:16 -07:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
#[inline]
|
|
|
|
fn hash(&self, _: &mut S) {
|
|
|
|
// No-op because the `hash` implementation will be wrong.
|
|
|
|
}
|
2013-09-26 12:58:56 -07:00
|
|
|
}
|
|
|
|
|
2013-10-07 19:16:58 -07:00
|
|
|
impl BytesContainer for Path {
|
|
|
|
#[inline]
|
|
|
|
fn container_as_bytes<'a>(&'a self) -> &'a [u8] {
|
|
|
|
self.as_vec()
|
|
|
|
}
|
|
|
|
#[inline]
|
2014-04-12 20:42:17 +10:00
|
|
|
fn container_into_owned_bytes(self) -> Vec<u8> {
|
2013-10-07 19:16:58 -07:00
|
|
|
self.into_vec()
|
|
|
|
}
|
|
|
|
#[inline]
|
2013-12-23 17:15:53 +01:00
|
|
|
fn container_as_str<'a>(&'a self) -> Option<&'a str> {
|
2013-10-07 19:16:58 -07:00
|
|
|
self.as_str()
|
|
|
|
}
|
|
|
|
#[inline]
|
|
|
|
fn is_str(_: Option<Path>) -> bool { true }
|
|
|
|
}
|
|
|
|
|
2013-12-09 23:16:18 -08:00
|
|
|
impl<'a> BytesContainer for &'a Path {
|
2013-10-07 19:16:58 -07:00
|
|
|
#[inline]
|
|
|
|
fn container_as_bytes<'a>(&'a self) -> &'a [u8] {
|
|
|
|
self.as_vec()
|
|
|
|
}
|
|
|
|
#[inline]
|
2013-12-23 17:15:53 +01:00
|
|
|
fn container_as_str<'a>(&'a self) -> Option<&'a str> {
|
2013-10-07 19:16:58 -07:00
|
|
|
self.as_str()
|
|
|
|
}
|
|
|
|
#[inline]
|
2013-12-09 23:16:18 -08:00
|
|
|
fn is_str(_: Option<&'a Path>) -> bool { true }
|
2013-10-07 19:16:58 -07:00
|
|
|
}
|
|
|
|
|
2013-08-27 00:51:08 -07:00
|
|
|
impl GenericPathUnsafe for Path {
|
|
|
|
/// See `GenericPathUnsafe::from_vec_unchecked`.
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
2013-12-23 17:50:27 +01:00
|
|
|
/// Fails if not valid UTF-8.
|
2013-08-27 00:51:08 -07:00
|
|
|
#[inline]
|
2013-12-03 19:15:12 -08:00
|
|
|
unsafe fn new_unchecked<T: BytesContainer>(path: T) -> Path {
|
2013-12-23 17:15:53 +01:00
|
|
|
let (prefix, path) = Path::normalize_(path.container_as_str().unwrap());
|
2013-08-27 00:51:08 -07:00
|
|
|
assert!(!path.is_empty());
|
|
|
|
let mut ret = Path{ repr: path, prefix: prefix, sepidx: None };
|
|
|
|
ret.update_sepidx();
|
|
|
|
ret
|
|
|
|
}
|
|
|
|
|
|
|
|
/// See `GenericPathUnsafe::set_filename_unchecekd`.
|
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
2013-12-23 17:50:27 +01:00
|
|
|
/// Fails if not valid UTF-8.
|
2013-10-05 19:49:32 -07:00
|
|
|
unsafe fn set_filename_unchecked<T: BytesContainer>(&mut self, filename: T) {
|
2013-12-23 17:15:53 +01:00
|
|
|
let filename = filename.container_as_str().unwrap();
|
2013-08-27 00:51:08 -07:00
|
|
|
match self.sepidx_or_prefix_len() {
|
2014-04-12 22:44:31 +10:00
|
|
|
None if ".." == self.repr.as_slice() => {
|
2014-05-22 16:57:53 -07:00
|
|
|
let mut s = String::with_capacity(3 + filename.len());
|
2013-08-27 00:51:08 -07:00
|
|
|
s.push_str("..");
|
2014-01-18 09:17:44 -08:00
|
|
|
s.push_char(SEP);
|
2013-08-27 00:51:08 -07:00
|
|
|
s.push_str(filename);
|
|
|
|
self.update_normalized(s);
|
|
|
|
}
|
|
|
|
None => {
|
|
|
|
self.update_normalized(filename);
|
|
|
|
}
|
2014-04-12 22:44:31 +10:00
|
|
|
Some((_,idxa,end)) if self.repr.as_slice().slice(idxa,end) == ".." => {
|
2014-05-22 16:57:53 -07:00
|
|
|
let mut s = String::with_capacity(end + 1 + filename.len());
|
2014-04-12 22:44:31 +10:00
|
|
|
s.push_str(self.repr.as_slice().slice_to(end));
|
2014-01-18 09:17:44 -08:00
|
|
|
s.push_char(SEP);
|
2013-08-27 00:51:08 -07:00
|
|
|
s.push_str(filename);
|
|
|
|
self.update_normalized(s);
|
|
|
|
}
|
|
|
|
Some((idxb,idxa,_)) if self.prefix == Some(DiskPrefix) && idxa == self.prefix_len() => {
|
2014-05-22 16:57:53 -07:00
|
|
|
let mut s = String::with_capacity(idxb + filename.len());
|
2014-04-12 22:44:31 +10:00
|
|
|
s.push_str(self.repr.as_slice().slice_to(idxb));
|
2013-08-27 00:51:08 -07:00
|
|
|
s.push_str(filename);
|
|
|
|
self.update_normalized(s);
|
|
|
|
}
|
|
|
|
Some((idxb,_,_)) => {
|
2014-05-22 16:57:53 -07:00
|
|
|
let mut s = String::with_capacity(idxb + 1 + filename.len());
|
2014-04-12 22:44:31 +10:00
|
|
|
s.push_str(self.repr.as_slice().slice_to(idxb));
|
2014-01-18 09:17:44 -08:00
|
|
|
s.push_char(SEP);
|
2013-08-27 00:51:08 -07:00
|
|
|
s.push_str(filename);
|
|
|
|
self.update_normalized(s);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/// See `GenericPathUnsafe::push_unchecked`.
|
|
|
|
///
|
|
|
|
/// Concatenating two Windows Paths is rather complicated.
|
|
|
|
/// For the most part, it will behave as expected, except in the case of
|
|
|
|
/// pushing a volume-relative path, e.g. `C:foo.txt`. Because we have no
|
|
|
|
/// concept of per-volume cwds like Windows does, we can't behave exactly
|
|
|
|
/// like Windows will. Instead, if the receiver is an absolute path on
|
|
|
|
/// the same volume as the new path, it will be treated as the cwd that
|
|
|
|
/// the new path is relative to. Otherwise, the new path will be treated
|
|
|
|
/// as if it were absolute and will replace the receiver outright.
|
2013-10-05 19:49:32 -07:00
|
|
|
unsafe fn push_unchecked<T: BytesContainer>(&mut self, path: T) {
|
2013-12-23 17:15:53 +01:00
|
|
|
let path = path.container_as_str().unwrap();
|
2013-08-27 00:51:08 -07:00
|
|
|
fn is_vol_abs(path: &str, prefix: Option<PathPrefix>) -> bool {
|
|
|
|
// assume prefix is Some(DiskPrefix)
|
|
|
|
let rest = path.slice_from(prefix_len(prefix));
|
2013-10-07 19:16:58 -07:00
|
|
|
!rest.is_empty() && rest[0].is_ascii() && is_sep(rest[0] as char)
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
fn shares_volume(me: &Path, path: &str) -> bool {
|
|
|
|
// path is assumed to have a prefix of Some(DiskPrefix)
|
2014-04-12 22:44:31 +10:00
|
|
|
let repr = me.repr.as_slice();
|
2013-08-27 00:51:08 -07:00
|
|
|
match me.prefix {
|
2014-04-12 22:44:31 +10:00
|
|
|
Some(DiskPrefix) => repr[0] == path[0].to_ascii().to_upper().to_byte(),
|
|
|
|
Some(VerbatimDiskPrefix) => repr[4] == path[0].to_ascii().to_upper().to_byte(),
|
2013-08-27 00:51:08 -07:00
|
|
|
_ => false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
fn is_sep_(prefix: Option<PathPrefix>, u: u8) -> bool {
|
2013-10-07 19:16:58 -07:00
|
|
|
if prefix_is_verbatim(prefix) { is_sep_verbatim(u as char) }
|
|
|
|
else { is_sep(u as char) }
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
fn replace_path(me: &mut Path, path: &str, prefix: Option<PathPrefix>) {
|
|
|
|
let newpath = Path::normalize__(path, prefix);
|
|
|
|
me.repr = match newpath {
|
|
|
|
Some(p) => p,
|
2014-05-22 16:57:53 -07:00
|
|
|
None => String::from_str(path)
|
2013-08-27 00:51:08 -07:00
|
|
|
};
|
|
|
|
me.prefix = prefix;
|
|
|
|
me.update_sepidx();
|
|
|
|
}
|
|
|
|
fn append_path(me: &mut Path, path: &str) {
|
|
|
|
// appends a path that has no prefix
|
|
|
|
// if me is verbatim, we need to pre-normalize the new path
|
2013-10-07 19:16:58 -07:00
|
|
|
let path_ = if is_verbatim(me) { Path::normalize__(path, None) }
|
2013-08-27 00:51:08 -07:00
|
|
|
else { None };
|
2013-12-06 19:51:10 +01:00
|
|
|
let pathlen = path_.as_ref().map_or(path.len(), |p| p.len());
|
2014-05-22 16:57:53 -07:00
|
|
|
let mut s = String::with_capacity(me.repr.len() + 1 + pathlen);
|
2014-04-12 22:44:31 +10:00
|
|
|
s.push_str(me.repr.as_slice());
|
2013-08-27 00:51:08 -07:00
|
|
|
let plen = me.prefix_len();
|
2014-01-15 12:53:56 -08:00
|
|
|
// if me is "C:" we don't want to add a path separator
|
|
|
|
match me.prefix {
|
|
|
|
Some(DiskPrefix) if me.repr.len() == plen => (),
|
2014-04-12 22:44:31 +10:00
|
|
|
_ if !(me.repr.len() > plen && me.repr.as_slice()[me.repr.len()-1] == SEP_BYTE) => {
|
2014-01-18 09:17:44 -08:00
|
|
|
s.push_char(SEP);
|
2014-01-15 12:53:56 -08:00
|
|
|
}
|
|
|
|
_ => ()
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
match path_ {
|
|
|
|
None => s.push_str(path),
|
2014-04-12 22:44:31 +10:00
|
|
|
Some(p) => s.push_str(p.as_slice())
|
2013-08-27 00:51:08 -07:00
|
|
|
};
|
|
|
|
me.update_normalized(s)
|
|
|
|
}
|
|
|
|
|
|
|
|
if !path.is_empty() {
|
|
|
|
let prefix = parse_prefix(path);
|
|
|
|
match prefix {
|
|
|
|
Some(DiskPrefix) if !is_vol_abs(path, prefix) && shares_volume(self, path) => {
|
|
|
|
// cwd-relative path, self is on the same volume
|
|
|
|
append_path(self, path.slice_from(prefix_len(prefix)));
|
|
|
|
}
|
|
|
|
Some(_) => {
|
|
|
|
// absolute path, or cwd-relative and self is not same volume
|
|
|
|
replace_path(self, path, prefix);
|
|
|
|
}
|
|
|
|
None if !path.is_empty() && is_sep_(self.prefix, path[0]) => {
|
|
|
|
// volume-relative path
|
2013-10-07 19:16:58 -07:00
|
|
|
if self.prefix.is_some() {
|
2013-08-27 00:51:08 -07:00
|
|
|
// truncate self down to the prefix, then append
|
|
|
|
let n = self.prefix_len();
|
|
|
|
self.repr.truncate(n);
|
|
|
|
append_path(self, path);
|
|
|
|
} else {
|
|
|
|
// we have no prefix, so nothing to be relative to
|
|
|
|
replace_path(self, path, prefix);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
None => {
|
|
|
|
// relative path
|
|
|
|
append_path(self, path);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
impl GenericPath for Path {
|
2013-09-26 00:54:30 -07:00
|
|
|
#[inline]
|
2013-12-03 19:15:12 -08:00
|
|
|
fn new_opt<T: BytesContainer>(path: T) -> Option<Path> {
|
2014-04-08 02:30:08 +01:00
|
|
|
match path.container_as_str() {
|
2013-10-05 19:49:32 -07:00
|
|
|
None => None,
|
2014-04-08 02:30:08 +01:00
|
|
|
Some(ref s) => {
|
|
|
|
if contains_nul(s) {
|
2013-10-05 19:49:32 -07:00
|
|
|
None
|
|
|
|
} else {
|
2014-04-08 02:30:08 +01:00
|
|
|
Some(unsafe { GenericPathUnsafe::new_unchecked(*s) })
|
2013-10-05 19:49:32 -07:00
|
|
|
}
|
|
|
|
}
|
2013-09-26 00:54:30 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-27 00:51:08 -07:00
|
|
|
/// See `GenericPath::as_str` for info.
|
|
|
|
/// Always returns a `Some` value.
|
|
|
|
#[inline]
|
|
|
|
fn as_str<'a>(&'a self) -> Option<&'a str> {
|
|
|
|
Some(self.repr.as_slice())
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
|
|
|
fn as_vec<'a>(&'a self) -> &'a [u8] {
|
|
|
|
self.repr.as_bytes()
|
|
|
|
}
|
|
|
|
|
2013-10-05 19:49:32 -07:00
|
|
|
#[inline]
|
2014-04-12 20:42:17 +10:00
|
|
|
fn into_vec(self) -> Vec<u8> {
|
|
|
|
Vec::from_slice(self.repr.as_bytes())
|
2013-10-05 19:49:32 -07:00
|
|
|
}
|
|
|
|
|
2013-08-27 00:51:08 -07:00
|
|
|
#[inline]
|
|
|
|
fn dirname<'a>(&'a self) -> &'a [u8] {
|
|
|
|
self.dirname_str().unwrap().as_bytes()
|
|
|
|
}
|
|
|
|
|
|
|
|
/// See `GenericPath::dirname_str` for info.
|
|
|
|
/// Always returns a `Some` value.
|
|
|
|
fn dirname_str<'a>(&'a self) -> Option<&'a str> {
|
|
|
|
Some(match self.sepidx_or_prefix_len() {
|
2014-04-12 22:44:31 +10:00
|
|
|
None if ".." == self.repr.as_slice() => self.repr.as_slice(),
|
2013-08-27 00:51:08 -07:00
|
|
|
None => ".",
|
2014-04-12 22:44:31 +10:00
|
|
|
Some((_,idxa,end)) if self.repr.as_slice().slice(idxa, end) == ".." => {
|
2013-08-27 00:51:08 -07:00
|
|
|
self.repr.as_slice()
|
|
|
|
}
|
2014-04-12 22:44:31 +10:00
|
|
|
Some((idxb,_,end)) if self.repr.as_slice().slice(idxb, end) == "\\" => {
|
2013-08-27 00:51:08 -07:00
|
|
|
self.repr.as_slice()
|
|
|
|
}
|
2014-04-12 22:44:31 +10:00
|
|
|
Some((0,idxa,_)) => self.repr.as_slice().slice_to(idxa),
|
2013-08-27 00:51:08 -07:00
|
|
|
Some((idxb,idxa,_)) => {
|
|
|
|
match self.prefix {
|
|
|
|
Some(DiskPrefix) | Some(VerbatimDiskPrefix) if idxb == self.prefix_len() => {
|
2014-04-12 22:44:31 +10:00
|
|
|
self.repr.as_slice().slice_to(idxa)
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
2014-04-12 22:44:31 +10:00
|
|
|
_ => self.repr.as_slice().slice_to(idxb)
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2013-09-26 17:21:59 -07:00
|
|
|
fn filename<'a>(&'a self) -> Option<&'a [u8]> {
|
2013-10-15 23:32:14 -07:00
|
|
|
self.filename_str().map(|x| x.as_bytes())
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/// See `GenericPath::filename_str` for info.
|
2013-09-26 17:21:59 -07:00
|
|
|
/// Always returns a `Some` value if `filename` returns a `Some` value.
|
2013-08-27 00:51:08 -07:00
|
|
|
fn filename_str<'a>(&'a self) -> Option<&'a str> {
|
2014-04-12 22:44:31 +10:00
|
|
|
let repr = self.repr.as_slice();
|
2013-09-26 17:21:59 -07:00
|
|
|
match self.sepidx_or_prefix_len() {
|
2014-04-12 22:44:31 +10:00
|
|
|
None if "." == repr || ".." == repr => None,
|
|
|
|
None => Some(repr),
|
|
|
|
Some((_,idxa,end)) if repr.slice(idxa, end) == ".." => None,
|
2013-09-26 17:21:59 -07:00
|
|
|
Some((_,idxa,end)) if idxa == end => None,
|
2014-04-12 22:44:31 +10:00
|
|
|
Some((_,idxa,end)) => Some(repr.slice(idxa, end))
|
2013-09-26 17:21:59 -07:00
|
|
|
}
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/// See `GenericPath::filestem_str` for info.
|
2013-09-26 17:21:59 -07:00
|
|
|
/// Always returns a `Some` value if `filestem` returns a `Some` value.
|
2013-08-27 00:51:08 -07:00
|
|
|
#[inline]
|
|
|
|
fn filestem_str<'a>(&'a self) -> Option<&'a str> {
|
|
|
|
// filestem() returns a byte vector that's guaranteed valid UTF-8
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 10:34:51 -07:00
|
|
|
self.filestem().map(|t| unsafe { mem::transmute(t) })
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
|
|
|
fn extension_str<'a>(&'a self) -> Option<&'a str> {
|
|
|
|
// extension() returns a byte vector that's guaranteed valid UTF-8
|
core: Remove the cast module
This commit revisits the `cast` module in libcore and libstd, and scrutinizes
all functions inside of it. The result was to remove the `cast` module entirely,
folding all functionality into the `mem` module. Specifically, this is the fate
of each function in the `cast` module.
* transmute - This function was moved to `mem`, but it is now marked as
#[unstable]. This is due to planned changes to the `transmute`
function and how it can be invoked (see the #[unstable] comment).
For more information, see RFC 5 and #12898
* transmute_copy - This function was moved to `mem`, with clarification that is
is not an error to invoke it with T/U that are different
sizes, but rather that it is strongly discouraged. This
function is now #[stable]
* forget - This function was moved to `mem` and marked #[stable]
* bump_box_refcount - This function was removed due to the deprecation of
managed boxes as well as its questionable utility.
* transmute_mut - This function was previously deprecated, and removed as part
of this commit.
* transmute_mut_unsafe - This function doesn't serve much of a purpose when it
can be achieved with an `as` in safe code, so it was
removed.
* transmute_lifetime - This function was removed because it is likely a strong
indication that code is incorrect in the first place.
* transmute_mut_lifetime - This function was removed for the same reasons as
`transmute_lifetime`
* copy_lifetime - This function was moved to `mem`, but it is marked
`#[unstable]` now due to the likelihood of being removed in
the future if it is found to not be very useful.
* copy_mut_lifetime - This function was also moved to `mem`, but had the same
treatment as `copy_lifetime`.
* copy_lifetime_vec - This function was removed because it is not used today,
and its existence is not necessary with DST
(copy_lifetime will suffice).
In summary, the cast module was stripped down to these functions, and then the
functions were moved to the `mem` module.
transmute - #[unstable]
transmute_copy - #[stable]
forget - #[stable]
copy_lifetime - #[unstable]
copy_mut_lifetime - #[unstable]
[breaking-change]
2014-05-09 10:34:51 -07:00
|
|
|
self.extension().map(|t| unsafe { mem::transmute(t) })
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
fn dir_path(&self) -> Path {
|
2013-12-03 19:15:12 -08:00
|
|
|
unsafe { GenericPathUnsafe::new_unchecked(self.dirname_str().unwrap()) }
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
#[inline]
|
2013-10-09 22:05:14 -07:00
|
|
|
fn pop(&mut self) -> bool {
|
2013-08-27 00:51:08 -07:00
|
|
|
match self.sepidx_or_prefix_len() {
|
2014-04-12 22:44:31 +10:00
|
|
|
None if "." == self.repr.as_slice() => false,
|
2013-08-27 00:51:08 -07:00
|
|
|
None => {
|
2014-05-22 16:57:53 -07:00
|
|
|
self.repr = String::from_str(".");
|
2013-08-27 00:51:08 -07:00
|
|
|
self.sepidx = None;
|
2013-10-09 22:05:14 -07:00
|
|
|
true
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
2013-10-09 22:05:14 -07:00
|
|
|
Some((idxb,idxa,end)) if idxb == idxa && idxb == end => false,
|
2014-04-12 22:44:31 +10:00
|
|
|
Some((idxb,_,end)) if self.repr.as_slice().slice(idxb, end) == "\\" => false,
|
2013-10-09 22:05:14 -07:00
|
|
|
Some((idxb,idxa,_)) => {
|
2013-08-27 00:51:08 -07:00
|
|
|
let trunc = match self.prefix {
|
|
|
|
Some(DiskPrefix) | Some(VerbatimDiskPrefix) | None => {
|
|
|
|
let plen = self.prefix_len();
|
|
|
|
if idxb == plen { idxa } else { idxb }
|
|
|
|
}
|
|
|
|
_ => idxb
|
|
|
|
};
|
|
|
|
self.repr.truncate(trunc);
|
|
|
|
self.update_sepidx();
|
2013-10-09 22:05:14 -07:00
|
|
|
true
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-09-26 17:21:59 -07:00
|
|
|
fn root_path(&self) -> Option<Path> {
|
2014-01-17 23:07:53 -08:00
|
|
|
if self.prefix.is_some() {
|
2013-12-03 19:15:12 -08:00
|
|
|
Some(Path::new(match self.prefix {
|
2014-01-17 23:07:53 -08:00
|
|
|
Some(DiskPrefix) if self.is_absolute() => {
|
2014-04-12 22:44:31 +10:00
|
|
|
self.repr.as_slice().slice_to(self.prefix_len()+1)
|
2014-01-17 23:07:53 -08:00
|
|
|
}
|
|
|
|
Some(VerbatimDiskPrefix) => {
|
2014-04-12 22:44:31 +10:00
|
|
|
self.repr.as_slice().slice_to(self.prefix_len()+1)
|
2013-09-26 17:21:59 -07:00
|
|
|
}
|
2014-04-12 22:44:31 +10:00
|
|
|
_ => self.repr.as_slice().slice_to(self.prefix_len())
|
2013-09-26 17:21:59 -07:00
|
|
|
}))
|
2013-10-07 19:16:58 -07:00
|
|
|
} else if is_vol_relative(self) {
|
2014-04-12 22:44:31 +10:00
|
|
|
Some(Path::new(self.repr.as_slice().slice_to(1)))
|
2013-09-26 17:21:59 -07:00
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-08-27 00:51:08 -07:00
|
|
|
/// See `GenericPath::is_absolute` for info.
|
|
|
|
///
|
|
|
|
/// A Windows Path is considered absolute only if it has a non-volume prefix,
|
|
|
|
/// or if it has a volume prefix and the path starts with '\'.
|
|
|
|
/// A path of `\foo` is not considered absolute because it's actually
|
|
|
|
/// relative to the "current volume". A separate method `Path::is_vol_relative`
|
|
|
|
/// is provided to indicate this case. Similarly a path of `C:foo` is not
|
|
|
|
/// considered absolute because it's relative to the cwd on volume C:. A
|
|
|
|
/// separate method `Path::is_cwd_relative` is provided to indicate this case.
|
|
|
|
#[inline]
|
|
|
|
fn is_absolute(&self) -> bool {
|
|
|
|
match self.prefix {
|
|
|
|
Some(DiskPrefix) => {
|
2014-04-12 22:44:31 +10:00
|
|
|
let rest = self.repr.as_slice().slice_from(self.prefix_len());
|
2014-01-18 09:17:44 -08:00
|
|
|
rest.len() > 0 && rest[0] == SEP_BYTE
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
Some(_) => true,
|
|
|
|
None => false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-09-26 17:21:59 -07:00
|
|
|
#[inline]
|
|
|
|
fn is_relative(&self) -> bool {
|
2013-10-07 19:16:58 -07:00
|
|
|
self.prefix.is_none() && !is_vol_relative(self)
|
2013-09-26 17:21:59 -07:00
|
|
|
}
|
|
|
|
|
2013-08-27 00:51:08 -07:00
|
|
|
fn is_ancestor_of(&self, other: &Path) -> bool {
|
|
|
|
if !self.equiv_prefix(other) {
|
|
|
|
false
|
|
|
|
} else if self.is_absolute() != other.is_absolute() ||
|
2013-10-07 19:16:58 -07:00
|
|
|
is_vol_relative(self) != is_vol_relative(other) {
|
2013-08-27 00:51:08 -07:00
|
|
|
false
|
|
|
|
} else {
|
2013-11-23 11:18:51 +01:00
|
|
|
let mut ita = self.str_components().map(|x|x.unwrap());
|
|
|
|
let mut itb = other.str_components().map(|x|x.unwrap());
|
2014-04-12 22:44:31 +10:00
|
|
|
if "." == self.repr.as_slice() {
|
2013-08-27 00:51:08 -07:00
|
|
|
return itb.next() != Some("..");
|
|
|
|
}
|
|
|
|
loop {
|
|
|
|
match (ita.next(), itb.next()) {
|
|
|
|
(None, _) => break,
|
2013-10-02 20:26:28 -07:00
|
|
|
(Some(a), Some(b)) if a == b => { continue },
|
2013-08-27 00:51:08 -07:00
|
|
|
(Some(a), _) if a == ".." => {
|
|
|
|
// if ita contains only .. components, it's an ancestor
|
|
|
|
return ita.all(|x| x == "..");
|
|
|
|
}
|
|
|
|
_ => return false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn path_relative_from(&self, base: &Path) -> Option<Path> {
|
|
|
|
fn comp_requires_verbatim(s: &str) -> bool {
|
2014-01-18 09:17:44 -08:00
|
|
|
s == "." || s == ".." || s.contains_char(SEP2)
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
if !self.equiv_prefix(base) {
|
|
|
|
// prefixes differ
|
|
|
|
if self.is_absolute() {
|
|
|
|
Some(self.clone())
|
|
|
|
} else if self.prefix == Some(DiskPrefix) && base.prefix == Some(DiskPrefix) {
|
|
|
|
// both drives, drive letters must differ or they'd be equiv
|
|
|
|
Some(self.clone())
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
} else if self.is_absolute() != base.is_absolute() {
|
|
|
|
if self.is_absolute() {
|
|
|
|
Some(self.clone())
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
2013-10-07 19:16:58 -07:00
|
|
|
} else if is_vol_relative(self) != is_vol_relative(base) {
|
|
|
|
if is_vol_relative(self) {
|
2013-08-27 00:51:08 -07:00
|
|
|
Some(self.clone())
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
} else {
|
2013-11-23 11:18:51 +01:00
|
|
|
let mut ita = self.str_components().map(|x|x.unwrap());
|
|
|
|
let mut itb = base.str_components().map(|x|x.unwrap());
|
2014-04-12 20:42:17 +10:00
|
|
|
let mut comps = vec![];
|
2013-08-27 00:51:08 -07:00
|
|
|
|
2013-10-07 19:16:58 -07:00
|
|
|
let a_verb = is_verbatim(self);
|
|
|
|
let b_verb = is_verbatim(base);
|
2013-08-27 00:51:08 -07:00
|
|
|
loop {
|
|
|
|
match (ita.next(), itb.next()) {
|
|
|
|
(None, None) => break,
|
|
|
|
(Some(a), None) if a_verb && comp_requires_verbatim(a) => {
|
|
|
|
return Some(self.clone())
|
|
|
|
}
|
|
|
|
(Some(a), None) => {
|
|
|
|
comps.push(a);
|
|
|
|
if !a_verb {
|
2014-03-20 14:12:56 +01:00
|
|
|
comps.extend(ita.by_ref());
|
2013-08-27 00:51:08 -07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
(None, _) => comps.push(".."),
|
|
|
|
(Some(a), Some(b)) if comps.is_empty() && a == b => (),
|
|
|
|
(Some(a), Some(b)) if !b_verb && b == "." => {
|
|
|
|
if a_verb && comp_requires_verbatim(a) {
|
|
|
|
return Some(self.clone())
|
|
|
|
} else { comps.push(a) }
|
|
|
|
}
|
|
|
|
(Some(_), Some(b)) if !b_verb && b == ".." => return None,
|
|
|
|
(Some(a), Some(_)) if a_verb && comp_requires_verbatim(a) => {
|
|
|
|
return Some(self.clone())
|
|
|
|
}
|
|
|
|
(Some(a), Some(_)) => {
|
|
|
|
comps.push("..");
|
|
|
|
for _ in itb {
|
|
|
|
comps.push("..");
|
|
|
|
}
|
|
|
|
comps.push(a);
|
|
|
|
if !a_verb {
|
2014-03-20 14:12:56 +01:00
|
|
|
comps.extend(ita.by_ref());
|
2013-08-27 00:51:08 -07:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-05-25 03:17:19 -07:00
|
|
|
Some(Path::new(comps.connect("\\").into_string()))
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
}
|
2013-09-26 14:38:26 -07:00
|
|
|
|
2013-10-05 19:49:32 -07:00
|
|
|
fn ends_with_path(&self, child: &Path) -> bool {
|
|
|
|
if !child.is_relative() { return false; }
|
2014-01-23 20:41:57 +01:00
|
|
|
let mut selfit = self.str_components().rev();
|
|
|
|
let mut childit = child.str_components().rev();
|
2013-10-05 19:49:32 -07:00
|
|
|
loop {
|
|
|
|
match (selfit.next(), childit.next()) {
|
|
|
|
(Some(a), Some(b)) => if a != b { return false; },
|
|
|
|
(Some(_), None) => break,
|
|
|
|
(None, Some(_)) => return false,
|
|
|
|
(None, None) => break
|
|
|
|
}
|
|
|
|
}
|
|
|
|
true
|
|
|
|
}
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
impl Path {
|
2013-10-05 19:49:32 -07:00
|
|
|
/// Returns a new Path from a byte vector or string
|
2013-08-27 00:51:08 -07:00
|
|
|
///
|
|
|
|
/// # Failure
|
|
|
|
///
|
Remove std::condition
This has been a long time coming. Conditions in rust were initially envisioned
as being a good alternative to error code return pattern. The idea is that all
errors are fatal-by-default, and you can opt-in to handling the error by
registering an error handler.
While sounding nice, conditions ended up having some unforseen shortcomings:
* Actually handling an error has some very awkward syntax:
let mut result = None;
let mut answer = None;
io::io_error::cond.trap(|e| { result = Some(e) }).inside(|| {
answer = Some(some_io_operation());
});
match result {
Some(err) => { /* hit an I/O error */ }
None => {
let answer = answer.unwrap();
/* deal with the result of I/O */
}
}
This pattern can certainly use functions like io::result, but at its core
actually handling conditions is fairly difficult
* The "zero value" of a function is often confusing. One of the main ideas
behind using conditions was to change the signature of I/O functions. Instead
of read_be_u32() returning a result, it returned a u32. Errors were notified
via a condition, and if you caught the condition you understood that the "zero
value" returned is actually a garbage value. These zero values are often
difficult to understand, however.
One case of this is the read_bytes() function. The function takes an integer
length of the amount of bytes to read, and returns an array of that size. The
array may actually be shorter, however, if an error occurred.
Another case is fs::stat(). The theoretical "zero value" is a blank stat
struct, but it's a little awkward to create and return a zero'd out stat
struct on a call to stat().
In general, the return value of functions that can raise error are much more
natural when using a Result as opposed to an always-usable zero-value.
* Conditions impose a necessary runtime requirement on *all* I/O. In theory I/O
is as simple as calling read() and write(), but using conditions imposed the
restriction that a rust local task was required if you wanted to catch errors
with I/O. While certainly an surmountable difficulty, this was always a bit of
a thorn in the side of conditions.
* Functions raising conditions are not always clear that they are raising
conditions. This suffers a similar problem to exceptions where you don't
actually know whether a function raises a condition or not. The documentation
likely explains, but if someone retroactively adds a condition to a function
there's nothing forcing upstream users to acknowledge a new point of task
failure.
* Libaries using I/O are not guaranteed to correctly raise on conditions when an
error occurs. In developing various I/O libraries, it's much easier to just
return `None` from a read rather than raising an error. The silent contract of
"don't raise on EOF" was a little difficult to understand and threw a wrench
into the answer of the question "when do I raise a condition?"
Many of these difficulties can be overcome through documentation, examples, and
general practice. In the end, all of these difficulties added together ended up
being too overwhelming and improving various aspects didn't end up helping that
much.
A result-based I/O error handling strategy also has shortcomings, but the
cognitive burden is much smaller. The tooling necessary to make this strategy as
usable as conditions were is much smaller than the tooling necessary for
conditions.
Perhaps conditions may manifest themselves as a future entity, but for now
we're going to remove them from the standard library.
Closes #9795
Closes #8968
2014-02-04 19:02:10 -08:00
|
|
|
/// Fails the task if the vector contains a NUL.
|
2013-12-23 17:50:27 +01:00
|
|
|
/// Fails if invalid UTF-8.
|
2013-08-27 00:51:08 -07:00
|
|
|
#[inline]
|
2013-12-03 19:15:12 -08:00
|
|
|
pub fn new<T: BytesContainer>(path: T) -> Path {
|
|
|
|
GenericPath::new(path)
|
2013-09-26 00:54:30 -07:00
|
|
|
}
|
|
|
|
|
2013-10-05 19:49:32 -07:00
|
|
|
/// Returns a new Path from a byte vector or string, if possible
|
2013-08-27 00:51:08 -07:00
|
|
|
#[inline]
|
2013-12-03 19:15:12 -08:00
|
|
|
pub fn new_opt<T: BytesContainer>(path: T) -> Option<Path> {
|
|
|
|
GenericPath::new_opt(path)
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
2013-09-26 17:21:59 -07:00
|
|
|
/// Returns an iterator that yields each component of the path in turn as a Option<&str>.
|
|
|
|
/// Every component is guaranteed to be Some.
|
2013-08-27 00:51:08 -07:00
|
|
|
/// Does not yield the path prefix (including server/share components in UNC paths).
|
|
|
|
/// Does not distinguish between volume-relative and relative paths, e.g.
|
|
|
|
/// \a\b\c and a\b\c.
|
|
|
|
/// Does not distinguish between absolute and cwd-relative paths, e.g.
|
|
|
|
/// C:\foo and C:foo.
|
2014-01-14 22:32:24 -05:00
|
|
|
pub fn str_components<'a>(&'a self) -> StrComponents<'a> {
|
2014-04-12 22:44:31 +10:00
|
|
|
let repr = self.repr.as_slice();
|
2013-08-27 00:51:08 -07:00
|
|
|
let s = match self.prefix {
|
|
|
|
Some(_) => {
|
|
|
|
let plen = self.prefix_len();
|
2014-04-12 22:44:31 +10:00
|
|
|
if repr.len() > plen && repr[plen] == SEP_BYTE {
|
|
|
|
repr.slice_from(plen+1)
|
|
|
|
} else { repr.slice_from(plen) }
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
2014-04-12 22:44:31 +10:00
|
|
|
None if repr[0] == SEP_BYTE => repr.slice_from(1),
|
|
|
|
None => repr
|
2013-08-27 00:51:08 -07:00
|
|
|
};
|
2014-01-18 09:17:44 -08:00
|
|
|
let ret = s.split_terminator(SEP).map(Some);
|
2013-08-27 00:51:08 -07:00
|
|
|
ret
|
|
|
|
}
|
|
|
|
|
2013-09-26 17:21:59 -07:00
|
|
|
/// Returns an iterator that yields each component of the path in turn as a &[u8].
|
2013-11-23 11:18:51 +01:00
|
|
|
/// See str_components() for details.
|
2014-01-14 22:32:24 -05:00
|
|
|
pub fn components<'a>(&'a self) -> Components<'a> {
|
2013-09-26 17:21:59 -07:00
|
|
|
fn convert<'a>(x: Option<&'a str>) -> &'a [u8] {
|
2014-03-21 18:05:05 -07:00
|
|
|
#![inline]
|
2013-09-26 17:21:59 -07:00
|
|
|
x.unwrap().as_bytes()
|
|
|
|
}
|
2013-11-23 11:18:51 +01:00
|
|
|
self.str_components().map(convert)
|
2013-09-26 17:21:59 -07:00
|
|
|
}
|
|
|
|
|
2013-08-27 00:51:08 -07:00
|
|
|
fn equiv_prefix(&self, other: &Path) -> bool {
|
2014-04-12 22:44:31 +10:00
|
|
|
let s_repr = self.repr.as_slice();
|
|
|
|
let o_repr = other.repr.as_slice();
|
2013-08-27 00:51:08 -07:00
|
|
|
match (self.prefix, other.prefix) {
|
|
|
|
(Some(DiskPrefix), Some(VerbatimDiskPrefix)) => {
|
|
|
|
self.is_absolute() &&
|
2014-04-12 22:44:31 +10:00
|
|
|
s_repr[0].to_ascii().eq_ignore_case(o_repr[4].to_ascii())
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
(Some(VerbatimDiskPrefix), Some(DiskPrefix)) => {
|
|
|
|
other.is_absolute() &&
|
2014-04-12 22:44:31 +10:00
|
|
|
s_repr[4].to_ascii().eq_ignore_case(o_repr[0].to_ascii())
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
(Some(VerbatimDiskPrefix), Some(VerbatimDiskPrefix)) => {
|
2014-04-12 22:44:31 +10:00
|
|
|
s_repr[4].to_ascii().eq_ignore_case(o_repr[4].to_ascii())
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
(Some(UNCPrefix(_,_)), Some(VerbatimUNCPrefix(_,_))) => {
|
2014-04-12 22:44:31 +10:00
|
|
|
s_repr.slice(2, self.prefix_len()) == o_repr.slice(8, other.prefix_len())
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
(Some(VerbatimUNCPrefix(_,_)), Some(UNCPrefix(_,_))) => {
|
2014-04-12 22:44:31 +10:00
|
|
|
s_repr.slice(8, self.prefix_len()) == o_repr.slice(2, other.prefix_len())
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
(None, None) => true,
|
|
|
|
(a, b) if a == b => {
|
2014-04-12 22:44:31 +10:00
|
|
|
s_repr.slice_to(self.prefix_len()) == o_repr.slice_to(other.prefix_len())
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
_ => false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-22 16:57:53 -07:00
|
|
|
fn normalize_<S: StrAllocating>(s: S) -> (Option<PathPrefix>, String) {
|
2013-08-27 00:51:08 -07:00
|
|
|
// make borrowck happy
|
|
|
|
let (prefix, val) = {
|
|
|
|
let prefix = parse_prefix(s.as_slice());
|
|
|
|
let path = Path::normalize__(s.as_slice(), prefix);
|
|
|
|
(prefix, path)
|
|
|
|
};
|
|
|
|
(prefix, match val {
|
2014-05-25 03:17:19 -07:00
|
|
|
None => s.into_string(),
|
2013-08-27 00:51:08 -07:00
|
|
|
Some(val) => val
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
2014-05-22 16:57:53 -07:00
|
|
|
fn normalize__(s: &str, prefix: Option<PathPrefix>) -> Option<String> {
|
2013-08-27 00:51:08 -07:00
|
|
|
if prefix_is_verbatim(prefix) {
|
|
|
|
// don't do any normalization
|
|
|
|
match prefix {
|
|
|
|
Some(VerbatimUNCPrefix(x, 0)) if s.len() == 8 + x => {
|
|
|
|
// the server component has no trailing '\'
|
2014-05-22 16:57:53 -07:00
|
|
|
let mut s = String::from_str(s);
|
2014-01-18 09:17:44 -08:00
|
|
|
s.push_char(SEP);
|
2014-04-12 22:44:31 +10:00
|
|
|
Some(s)
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
_ => None
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
let (is_abs, comps) = normalize_helper(s, prefix);
|
|
|
|
let mut comps = comps;
|
|
|
|
match (comps.is_some(),prefix) {
|
|
|
|
(false, Some(DiskPrefix)) => {
|
|
|
|
if s[0] >= 'a' as u8 && s[0] <= 'z' as u8 {
|
2014-04-12 20:42:17 +10:00
|
|
|
comps = Some(vec![]);
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
(false, Some(VerbatimDiskPrefix)) => {
|
|
|
|
if s[4] >= 'a' as u8 && s[0] <= 'z' as u8 {
|
2014-04-12 20:42:17 +10:00
|
|
|
comps = Some(vec![]);
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
_ => ()
|
|
|
|
}
|
|
|
|
match comps {
|
|
|
|
None => None,
|
|
|
|
Some(comps) => {
|
|
|
|
if prefix.is_some() && comps.is_empty() {
|
|
|
|
match prefix.unwrap() {
|
|
|
|
DiskPrefix => {
|
|
|
|
let len = prefix_len(prefix) + is_abs as uint;
|
2014-05-22 16:57:53 -07:00
|
|
|
let mut s = String::from_str(s.slice_to(len));
|
2013-10-15 23:32:14 -07:00
|
|
|
unsafe {
|
2014-04-12 22:44:31 +10:00
|
|
|
let v = s.as_mut_vec();
|
2014-05-16 10:45:16 -07:00
|
|
|
*v.get_mut(0) = v.get(0)
|
|
|
|
.to_ascii()
|
|
|
|
.to_upper()
|
|
|
|
.to_byte();
|
2013-10-15 23:32:14 -07:00
|
|
|
}
|
2013-08-27 00:51:08 -07:00
|
|
|
if is_abs {
|
2013-10-15 23:32:14 -07:00
|
|
|
// normalize C:/ to C:\
|
|
|
|
unsafe {
|
2014-04-12 22:44:31 +10:00
|
|
|
*s.as_mut_vec().get_mut(2) = SEP_BYTE;
|
2013-10-15 23:32:14 -07:00
|
|
|
}
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
Some(s)
|
|
|
|
}
|
|
|
|
VerbatimDiskPrefix => {
|
|
|
|
let len = prefix_len(prefix) + is_abs as uint;
|
2014-05-22 16:57:53 -07:00
|
|
|
let mut s = String::from_str(s.slice_to(len));
|
2013-10-15 23:32:14 -07:00
|
|
|
unsafe {
|
2014-04-12 22:44:31 +10:00
|
|
|
let v = s.as_mut_vec();
|
|
|
|
*v.get_mut(4) = v.get(4).to_ascii().to_upper().to_byte();
|
2013-10-15 23:32:14 -07:00
|
|
|
}
|
2013-08-27 00:51:08 -07:00
|
|
|
Some(s)
|
|
|
|
}
|
|
|
|
_ => {
|
|
|
|
let plen = prefix_len(prefix);
|
|
|
|
if s.len() > plen {
|
2014-05-22 16:57:53 -07:00
|
|
|
Some(String::from_str(s.slice_to(plen)))
|
2013-08-27 00:51:08 -07:00
|
|
|
} else { None }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} else if is_abs && comps.is_empty() {
|
2014-05-22 16:57:53 -07:00
|
|
|
Some(String::from_char(1, SEP))
|
2013-08-27 00:51:08 -07:00
|
|
|
} else {
|
|
|
|
let prefix_ = s.slice_to(prefix_len(prefix));
|
|
|
|
let n = prefix_.len() +
|
|
|
|
if is_abs { comps.len() } else { comps.len() - 1} +
|
|
|
|
comps.iter().map(|v| v.len()).sum();
|
2014-05-22 16:57:53 -07:00
|
|
|
let mut s = String::with_capacity(n);
|
2013-08-27 00:51:08 -07:00
|
|
|
match prefix {
|
|
|
|
Some(DiskPrefix) => {
|
|
|
|
s.push_char(prefix_[0].to_ascii().to_upper().to_char());
|
|
|
|
s.push_char(':');
|
|
|
|
}
|
|
|
|
Some(VerbatimDiskPrefix) => {
|
|
|
|
s.push_str(prefix_.slice_to(4));
|
|
|
|
s.push_char(prefix_[4].to_ascii().to_upper().to_char());
|
|
|
|
s.push_str(prefix_.slice_from(5));
|
|
|
|
}
|
|
|
|
Some(UNCPrefix(a,b)) => {
|
|
|
|
s.push_str("\\\\");
|
|
|
|
s.push_str(prefix_.slice(2, a+2));
|
2014-01-18 09:17:44 -08:00
|
|
|
s.push_char(SEP);
|
2013-08-27 00:51:08 -07:00
|
|
|
s.push_str(prefix_.slice(3+a, 3+a+b));
|
|
|
|
}
|
|
|
|
Some(_) => s.push_str(prefix_),
|
|
|
|
None => ()
|
|
|
|
}
|
|
|
|
let mut it = comps.move_iter();
|
|
|
|
if !is_abs {
|
|
|
|
match it.next() {
|
|
|
|
None => (),
|
|
|
|
Some(comp) => s.push_str(comp)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
for comp in it {
|
2014-01-18 09:17:44 -08:00
|
|
|
s.push_char(SEP);
|
2013-08-27 00:51:08 -07:00
|
|
|
s.push_str(comp);
|
|
|
|
}
|
2014-04-12 22:44:31 +10:00
|
|
|
Some(s)
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn update_sepidx(&mut self) {
|
|
|
|
let s = if self.has_nonsemantic_trailing_slash() {
|
2014-04-12 22:44:31 +10:00
|
|
|
self.repr.as_slice().slice_to(self.repr.len()-1)
|
2013-08-27 00:51:08 -07:00
|
|
|
} else { self.repr.as_slice() };
|
2013-10-07 19:16:58 -07:00
|
|
|
let idx = s.rfind(if !prefix_is_verbatim(self.prefix) { is_sep }
|
|
|
|
else { is_sep_verbatim });
|
2013-08-27 00:51:08 -07:00
|
|
|
let prefixlen = self.prefix_len();
|
|
|
|
self.sepidx = idx.and_then(|x| if x < prefixlen { None } else { Some(x) });
|
|
|
|
}
|
|
|
|
|
|
|
|
fn prefix_len(&self) -> uint {
|
|
|
|
prefix_len(self.prefix)
|
|
|
|
}
|
|
|
|
|
|
|
|
// Returns a tuple (before, after, end) where before is the index of the separator
|
|
|
|
// and after is the index just after the separator.
|
|
|
|
// end is the length of the string, normally, or the index of the final character if it is
|
|
|
|
// a non-semantic trailing separator in a verbatim string.
|
|
|
|
// If the prefix is considered the separator, before and after are the same.
|
|
|
|
fn sepidx_or_prefix_len(&self) -> Option<(uint,uint,uint)> {
|
|
|
|
match self.sepidx {
|
|
|
|
None => match self.prefix_len() { 0 => None, x => Some((x,x,self.repr.len())) },
|
|
|
|
Some(x) => {
|
|
|
|
if self.has_nonsemantic_trailing_slash() {
|
|
|
|
Some((x,x+1,self.repr.len()-1))
|
|
|
|
} else { Some((x,x+1,self.repr.len())) }
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn has_nonsemantic_trailing_slash(&self) -> bool {
|
2013-10-07 19:16:58 -07:00
|
|
|
is_verbatim(self) && self.repr.len() > self.prefix_len()+1 &&
|
2014-04-12 22:44:31 +10:00
|
|
|
self.repr.as_slice()[self.repr.len()-1] == SEP_BYTE
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
fn update_normalized<S: Str>(&mut self, s: S) {
|
2014-04-30 23:06:36 -07:00
|
|
|
let (prefix, path) = Path::normalize_(s.as_slice());
|
2013-08-27 00:51:08 -07:00
|
|
|
self.repr = path;
|
|
|
|
self.prefix = prefix;
|
|
|
|
self.update_sepidx();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-10-07 19:16:58 -07:00
|
|
|
/// Returns whether the path is considered "volume-relative", which means a path
|
|
|
|
/// that looks like "\foo". Paths of this form are relative to the current volume,
|
|
|
|
/// but absolute within that volume.
|
|
|
|
#[inline]
|
|
|
|
pub fn is_vol_relative(path: &Path) -> bool {
|
2014-04-12 22:44:31 +10:00
|
|
|
path.prefix.is_none() && is_sep_byte(&path.repr.as_slice()[0])
|
2013-10-07 19:16:58 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns whether the path is considered "cwd-relative", which means a path
|
|
|
|
/// with a volume prefix that is not absolute. This look like "C:foo.txt". Paths
|
|
|
|
/// of this form are relative to the cwd on the given volume.
|
|
|
|
#[inline]
|
|
|
|
pub fn is_cwd_relative(path: &Path) -> bool {
|
|
|
|
path.prefix == Some(DiskPrefix) && !path.is_absolute()
|
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns the PathPrefix for this Path
|
|
|
|
#[inline]
|
|
|
|
pub fn prefix(path: &Path) -> Option<PathPrefix> {
|
|
|
|
path.prefix
|
|
|
|
}
|
|
|
|
|
2014-02-27 00:19:27 -08:00
|
|
|
/// Returns whether the Path's prefix is a verbatim prefix, i.e. `\\?\`
|
2013-10-07 19:16:58 -07:00
|
|
|
#[inline]
|
|
|
|
pub fn is_verbatim(path: &Path) -> bool {
|
|
|
|
prefix_is_verbatim(path.prefix)
|
|
|
|
}
|
|
|
|
|
2014-02-27 00:25:43 -08:00
|
|
|
/// Returns the non-verbatim equivalent of the input path, if possible.
|
|
|
|
/// If the input path is a device namespace path, None is returned.
|
|
|
|
/// If the input path is not verbatim, it is returned as-is.
|
|
|
|
/// If the input path is verbatim, but the same path can be expressed as
|
|
|
|
/// non-verbatim, the non-verbatim version is returned.
|
|
|
|
/// Otherwise, None is returned.
|
|
|
|
pub fn make_non_verbatim(path: &Path) -> Option<Path> {
|
2014-04-12 22:44:31 +10:00
|
|
|
let repr = path.repr.as_slice();
|
2014-02-27 00:25:43 -08:00
|
|
|
let new_path = match path.prefix {
|
|
|
|
Some(VerbatimPrefix(_)) | Some(DeviceNSPrefix(_)) => return None,
|
|
|
|
Some(UNCPrefix(_,_)) | Some(DiskPrefix) | None => return Some(path.clone()),
|
|
|
|
Some(VerbatimDiskPrefix) => {
|
|
|
|
// \\?\D:\
|
2014-04-12 22:44:31 +10:00
|
|
|
Path::new(repr.slice_from(4))
|
2014-02-27 00:25:43 -08:00
|
|
|
}
|
|
|
|
Some(VerbatimUNCPrefix(_,_)) => {
|
|
|
|
// \\?\UNC\server\share
|
2014-05-16 10:45:16 -07:00
|
|
|
Path::new(format_strbuf!(r"\\{}", repr.slice_from(7)))
|
2014-02-27 00:25:43 -08:00
|
|
|
}
|
|
|
|
};
|
|
|
|
if new_path.prefix.is_none() {
|
|
|
|
// \\?\UNC\server is a VerbatimUNCPrefix
|
|
|
|
// but \\server is nothing
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
// now ensure normalization didn't change anything
|
2014-04-12 22:44:31 +10:00
|
|
|
if repr.slice_from(path.prefix_len()) ==
|
|
|
|
new_path.repr.as_slice().slice_from(new_path.prefix_len()) {
|
2014-02-27 00:25:43 -08:00
|
|
|
Some(new_path)
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-09-01 12:44:07 -07:00
|
|
|
/// The standard path separator character
|
2014-01-18 09:17:44 -08:00
|
|
|
pub static SEP: char = '\\';
|
|
|
|
/// The standard path separator byte
|
|
|
|
pub static SEP_BYTE: u8 = SEP as u8;
|
|
|
|
|
|
|
|
/// The alternative path separator character
|
|
|
|
pub static SEP2: char = '/';
|
2013-09-01 12:44:07 -07:00
|
|
|
/// The alternative path separator character
|
2014-01-18 09:17:44 -08:00
|
|
|
pub static SEP2_BYTE: u8 = SEP2 as u8;
|
2013-08-27 00:51:08 -07:00
|
|
|
|
2013-10-07 19:16:58 -07:00
|
|
|
/// Returns whether the given char is a path separator.
|
|
|
|
/// Allows both the primary separator '\' and the alternative separator '/'.
|
2013-08-27 00:51:08 -07:00
|
|
|
#[inline]
|
|
|
|
pub fn is_sep(c: char) -> bool {
|
2014-01-18 09:17:44 -08:00
|
|
|
c == SEP || c == SEP2
|
2013-10-07 19:16:58 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns whether the given char is a path separator.
|
|
|
|
/// Only allows the primary separator '\'; use is_sep to allow '/'.
|
|
|
|
#[inline]
|
|
|
|
pub fn is_sep_verbatim(c: char) -> bool {
|
2014-01-18 09:17:44 -08:00
|
|
|
c == SEP
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
2013-09-01 12:44:07 -07:00
|
|
|
|
2013-08-27 00:51:08 -07:00
|
|
|
/// Returns whether the given byte is a path separator.
|
|
|
|
/// Allows both the primary separator '\' and the alternative separator '/'.
|
2013-09-01 12:44:07 -07:00
|
|
|
#[inline]
|
2013-10-07 19:16:58 -07:00
|
|
|
pub fn is_sep_byte(u: &u8) -> bool {
|
2014-01-18 09:17:44 -08:00
|
|
|
*u == SEP_BYTE || *u == SEP2_BYTE
|
2013-10-07 19:16:58 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Returns whether the given byte is a path separator.
|
|
|
|
/// Only allows the primary separator '\'; use is_sep_byte to allow '/'.
|
|
|
|
#[inline]
|
|
|
|
pub fn is_sep_byte_verbatim(u: &u8) -> bool {
|
2014-01-18 09:17:44 -08:00
|
|
|
*u == SEP_BYTE
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/// Prefix types for Path
|
2014-03-05 01:19:14 -05:00
|
|
|
#[deriving(Eq, Clone)]
|
2013-08-27 00:51:08 -07:00
|
|
|
pub enum PathPrefix {
|
|
|
|
/// Prefix `\\?\`, uint is the length of the following component
|
|
|
|
VerbatimPrefix(uint),
|
|
|
|
/// Prefix `\\?\UNC\`, uints are the lengths of the UNC components
|
|
|
|
VerbatimUNCPrefix(uint, uint),
|
|
|
|
/// Prefix `\\?\C:\` (for any alphabetic character)
|
|
|
|
VerbatimDiskPrefix,
|
|
|
|
/// Prefix `\\.\`, uint is the length of the following component
|
|
|
|
DeviceNSPrefix(uint),
|
|
|
|
/// UNC prefix `\\server\share`, uints are the lengths of the server/share
|
|
|
|
UNCPrefix(uint, uint),
|
|
|
|
/// Prefix `C:` for any alphabetic character
|
|
|
|
DiskPrefix
|
|
|
|
}
|
|
|
|
|
2013-10-16 09:55:55 -07:00
|
|
|
fn parse_prefix<'a>(mut path: &'a str) -> Option<PathPrefix> {
|
2013-08-27 00:51:08 -07:00
|
|
|
if path.starts_with("\\\\") {
|
|
|
|
// \\
|
|
|
|
path = path.slice_from(2);
|
|
|
|
if path.starts_with("?\\") {
|
|
|
|
// \\?\
|
|
|
|
path = path.slice_from(2);
|
|
|
|
if path.starts_with("UNC\\") {
|
|
|
|
// \\?\UNC\server\share
|
|
|
|
path = path.slice_from(4);
|
2013-10-07 19:16:58 -07:00
|
|
|
let (idx_a, idx_b) = match parse_two_comps(path, is_sep_verbatim) {
|
2013-08-27 00:51:08 -07:00
|
|
|
Some(x) => x,
|
|
|
|
None => (path.len(), 0)
|
|
|
|
};
|
|
|
|
return Some(VerbatimUNCPrefix(idx_a, idx_b));
|
|
|
|
} else {
|
|
|
|
// \\?\path
|
|
|
|
let idx = path.find('\\');
|
|
|
|
if idx == Some(2) && path[1] == ':' as u8 {
|
|
|
|
let c = path[0];
|
|
|
|
if c.is_ascii() && ::char::is_alphabetic(c as char) {
|
|
|
|
// \\?\C:\ path
|
|
|
|
return Some(VerbatimDiskPrefix);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
let idx = idx.unwrap_or(path.len());
|
|
|
|
return Some(VerbatimPrefix(idx));
|
|
|
|
}
|
|
|
|
} else if path.starts_with(".\\") {
|
|
|
|
// \\.\path
|
|
|
|
path = path.slice_from(2);
|
|
|
|
let idx = path.find('\\').unwrap_or(path.len());
|
|
|
|
return Some(DeviceNSPrefix(idx));
|
|
|
|
}
|
2013-10-07 19:16:58 -07:00
|
|
|
match parse_two_comps(path, is_sep) {
|
2013-08-27 00:51:08 -07:00
|
|
|
Some((idx_a, idx_b)) if idx_a > 0 && idx_b > 0 => {
|
|
|
|
// \\server\share
|
|
|
|
return Some(UNCPrefix(idx_a, idx_b));
|
|
|
|
}
|
|
|
|
_ => ()
|
|
|
|
}
|
|
|
|
} else if path.len() > 1 && path[1] == ':' as u8 {
|
|
|
|
// C:
|
|
|
|
let c = path[0];
|
|
|
|
if c.is_ascii() && ::char::is_alphabetic(c as char) {
|
|
|
|
return Some(DiskPrefix);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return None;
|
|
|
|
|
2013-11-18 21:15:42 -08:00
|
|
|
fn parse_two_comps<'a>(mut path: &'a str, f: |char| -> bool)
|
|
|
|
-> Option<(uint, uint)> {
|
2013-08-27 00:51:08 -07:00
|
|
|
let idx_a = match path.find(|x| f(x)) {
|
|
|
|
None => return None,
|
|
|
|
Some(x) => x
|
|
|
|
};
|
|
|
|
path = path.slice_from(idx_a+1);
|
|
|
|
let idx_b = path.find(f).unwrap_or(path.len());
|
|
|
|
Some((idx_a, idx_b))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// None result means the string didn't need normalizing
|
2014-04-12 20:42:17 +10:00
|
|
|
fn normalize_helper<'a>(s: &'a str, prefix: Option<PathPrefix>) -> (bool, Option<Vec<&'a str>>) {
|
2013-10-07 19:16:58 -07:00
|
|
|
let f = if !prefix_is_verbatim(prefix) { is_sep } else { is_sep_verbatim };
|
2013-08-27 00:51:08 -07:00
|
|
|
let is_abs = s.len() > prefix_len(prefix) && f(s.char_at(prefix_len(prefix)));
|
|
|
|
let s_ = s.slice_from(prefix_len(prefix));
|
|
|
|
let s_ = if is_abs { s_.slice_from(1) } else { s_ };
|
|
|
|
|
|
|
|
if is_abs && s_.is_empty() {
|
|
|
|
return (is_abs, match prefix {
|
2013-10-07 19:16:58 -07:00
|
|
|
Some(DiskPrefix) | None => (if is_sep_verbatim(s.char_at(prefix_len(prefix))) { None }
|
2014-04-12 20:42:17 +10:00
|
|
|
else { Some(vec![]) }),
|
|
|
|
Some(_) => Some(vec![]), // need to trim the trailing separator
|
2013-08-27 00:51:08 -07:00
|
|
|
});
|
|
|
|
}
|
2014-04-12 20:42:17 +10:00
|
|
|
let mut comps: Vec<&'a str> = vec![];
|
2013-08-27 00:51:08 -07:00
|
|
|
let mut n_up = 0u;
|
|
|
|
let mut changed = false;
|
2013-11-23 11:18:51 +01:00
|
|
|
for comp in s_.split(f) {
|
2013-08-27 00:51:08 -07:00
|
|
|
if comp.is_empty() { changed = true }
|
|
|
|
else if comp == "." { changed = true }
|
|
|
|
else if comp == ".." {
|
|
|
|
let has_abs_prefix = match prefix {
|
|
|
|
Some(DiskPrefix) => false,
|
|
|
|
Some(_) => true,
|
|
|
|
None => false
|
|
|
|
};
|
|
|
|
if (is_abs || has_abs_prefix) && comps.is_empty() { changed = true }
|
|
|
|
else if comps.len() == n_up { comps.push(".."); n_up += 1 }
|
2013-12-23 16:20:52 +01:00
|
|
|
else { comps.pop().unwrap(); changed = true }
|
2013-08-27 00:51:08 -07:00
|
|
|
} else { comps.push(comp) }
|
|
|
|
}
|
|
|
|
if !changed && !prefix_is_verbatim(prefix) {
|
2013-10-07 19:16:58 -07:00
|
|
|
changed = s.find(is_sep).is_some();
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
if changed {
|
|
|
|
if comps.is_empty() && !is_abs && prefix.is_none() {
|
|
|
|
if s == "." {
|
|
|
|
return (is_abs, None);
|
|
|
|
}
|
|
|
|
comps.push(".");
|
|
|
|
}
|
|
|
|
(is_abs, Some(comps))
|
|
|
|
} else {
|
|
|
|
(is_abs, None)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn prefix_is_verbatim(p: Option<PathPrefix>) -> bool {
|
|
|
|
match p {
|
|
|
|
Some(VerbatimPrefix(_)) | Some(VerbatimUNCPrefix(_,_)) | Some(VerbatimDiskPrefix) => true,
|
|
|
|
Some(DeviceNSPrefix(_)) => true, // not really sure, but I think so
|
|
|
|
_ => false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
fn prefix_len(p: Option<PathPrefix>) -> uint {
|
|
|
|
match p {
|
|
|
|
None => 0,
|
|
|
|
Some(VerbatimPrefix(x)) => 4 + x,
|
|
|
|
Some(VerbatimUNCPrefix(x,y)) => 8 + x + 1 + y,
|
|
|
|
Some(VerbatimDiskPrefix) => 6,
|
|
|
|
Some(UNCPrefix(x,y)) => 2 + x + 1 + y,
|
|
|
|
Some(DeviceNSPrefix(x)) => 4 + x,
|
|
|
|
Some(DiskPrefix) => 2
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
2014-01-06 22:33:37 -08:00
|
|
|
use prelude::*;
|
2013-08-27 00:51:08 -07:00
|
|
|
use super::*;
|
2013-10-16 09:55:55 -07:00
|
|
|
use super::parse_prefix;
|
2013-08-27 00:51:08 -07:00
|
|
|
|
|
|
|
macro_rules! t(
|
|
|
|
(s: $path:expr, $exp:expr) => (
|
|
|
|
{
|
|
|
|
let path = $path;
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(path.as_str() == Some($exp));
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
);
|
|
|
|
(v: $path:expr, $exp:expr) => (
|
|
|
|
{
|
|
|
|
let path = $path;
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(path.as_vec() == $exp);
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
macro_rules! b(
|
|
|
|
($($arg:expr),+) => (
|
2014-01-15 14:39:08 -05:00
|
|
|
{
|
|
|
|
static the_bytes: &'static [u8] = bytes!($($arg),+);
|
|
|
|
the_bytes
|
|
|
|
}
|
2013-08-27 00:51:08 -07:00
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_parse_prefix() {
|
|
|
|
macro_rules! t(
|
|
|
|
($path:expr, $exp:expr) => (
|
|
|
|
{
|
|
|
|
let path = $path;
|
|
|
|
let exp = $exp;
|
|
|
|
let res = parse_prefix(path);
|
|
|
|
assert!(res == exp,
|
2013-10-01 23:41:59 -07:00
|
|
|
"parse_prefix(\"{}\"): expected {:?}, found {:?}", path, exp, res);
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
t!("\\\\SERVER\\share\\foo", Some(UNCPrefix(6,5)));
|
|
|
|
t!("\\\\", None);
|
|
|
|
t!("\\\\SERVER", None);
|
|
|
|
t!("\\\\SERVER\\", None);
|
|
|
|
t!("\\\\SERVER\\\\", None);
|
|
|
|
t!("\\\\SERVER\\\\foo", None);
|
|
|
|
t!("\\\\SERVER\\share", Some(UNCPrefix(6,5)));
|
|
|
|
t!("\\\\SERVER/share/foo", Some(UNCPrefix(6,5)));
|
|
|
|
t!("\\\\SERVER\\share/foo", Some(UNCPrefix(6,5)));
|
|
|
|
t!("//SERVER/share/foo", None);
|
|
|
|
t!("\\\\\\a\\b\\c", None);
|
|
|
|
t!("\\\\?\\a\\b\\c", Some(VerbatimPrefix(1)));
|
|
|
|
t!("\\\\?\\a/b/c", Some(VerbatimPrefix(5)));
|
|
|
|
t!("//?/a/b/c", None);
|
|
|
|
t!("\\\\.\\a\\b", Some(DeviceNSPrefix(1)));
|
|
|
|
t!("\\\\.\\a/b", Some(DeviceNSPrefix(3)));
|
|
|
|
t!("//./a/b", None);
|
|
|
|
t!("\\\\?\\UNC\\server\\share\\foo", Some(VerbatimUNCPrefix(6,5)));
|
|
|
|
t!("\\\\?\\UNC\\\\share\\foo", Some(VerbatimUNCPrefix(0,5)));
|
|
|
|
t!("\\\\?\\UNC\\", Some(VerbatimUNCPrefix(0,0)));
|
|
|
|
t!("\\\\?\\UNC\\server/share/foo", Some(VerbatimUNCPrefix(16,0)));
|
|
|
|
t!("\\\\?\\UNC\\server", Some(VerbatimUNCPrefix(6,0)));
|
|
|
|
t!("\\\\?\\UNC\\server\\", Some(VerbatimUNCPrefix(6,0)));
|
|
|
|
t!("\\\\?\\UNC/server/share", Some(VerbatimPrefix(16)));
|
|
|
|
t!("\\\\?\\UNC", Some(VerbatimPrefix(3)));
|
|
|
|
t!("\\\\?\\C:\\a\\b.txt", Some(VerbatimDiskPrefix));
|
|
|
|
t!("\\\\?\\z:\\", Some(VerbatimDiskPrefix));
|
|
|
|
t!("\\\\?\\C:", Some(VerbatimPrefix(2)));
|
|
|
|
t!("\\\\?\\C:a.txt", Some(VerbatimPrefix(7)));
|
|
|
|
t!("\\\\?\\C:a\\b.txt", Some(VerbatimPrefix(3)));
|
|
|
|
t!("\\\\?\\C:/a", Some(VerbatimPrefix(4)));
|
|
|
|
t!("C:\\foo", Some(DiskPrefix));
|
|
|
|
t!("z:/foo", Some(DiskPrefix));
|
|
|
|
t!("d:", Some(DiskPrefix));
|
|
|
|
t!("ab:", None);
|
|
|
|
t!("ü:\\foo", None);
|
|
|
|
t!("3:\\foo", None);
|
|
|
|
t!(" :\\foo", None);
|
|
|
|
t!("::\\foo", None);
|
|
|
|
t!("\\\\?\\C:", Some(VerbatimPrefix(2)));
|
|
|
|
t!("\\\\?\\z:\\", Some(VerbatimDiskPrefix));
|
|
|
|
t!("\\\\?\\ab:\\", Some(VerbatimPrefix(3)));
|
|
|
|
t!("\\\\?\\C:\\a", Some(VerbatimDiskPrefix));
|
|
|
|
t!("\\\\?\\C:/a", Some(VerbatimPrefix(4)));
|
|
|
|
t!("\\\\?\\C:\\a/b", Some(VerbatimDiskPrefix));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_paths() {
|
2013-10-05 19:49:32 -07:00
|
|
|
let empty: &[u8] = [];
|
2013-12-03 19:15:12 -08:00
|
|
|
t!(v: Path::new(empty), b!("."));
|
|
|
|
t!(v: Path::new(b!("\\")), b!("\\"));
|
|
|
|
t!(v: Path::new(b!("a\\b\\c")), b!("a\\b\\c"));
|
|
|
|
|
|
|
|
t!(s: Path::new(""), ".");
|
|
|
|
t!(s: Path::new("\\"), "\\");
|
|
|
|
t!(s: Path::new("hi"), "hi");
|
|
|
|
t!(s: Path::new("hi\\"), "hi");
|
|
|
|
t!(s: Path::new("\\lib"), "\\lib");
|
|
|
|
t!(s: Path::new("\\lib\\"), "\\lib");
|
|
|
|
t!(s: Path::new("hi\\there"), "hi\\there");
|
|
|
|
t!(s: Path::new("hi\\there.txt"), "hi\\there.txt");
|
|
|
|
t!(s: Path::new("/"), "\\");
|
|
|
|
t!(s: Path::new("hi/"), "hi");
|
|
|
|
t!(s: Path::new("/lib"), "\\lib");
|
|
|
|
t!(s: Path::new("/lib/"), "\\lib");
|
|
|
|
t!(s: Path::new("hi/there"), "hi\\there");
|
|
|
|
|
|
|
|
t!(s: Path::new("hi\\there\\"), "hi\\there");
|
|
|
|
t!(s: Path::new("hi\\..\\there"), "there");
|
|
|
|
t!(s: Path::new("hi/../there"), "there");
|
|
|
|
t!(s: Path::new("..\\hi\\there"), "..\\hi\\there");
|
|
|
|
t!(s: Path::new("\\..\\hi\\there"), "\\hi\\there");
|
|
|
|
t!(s: Path::new("/../hi/there"), "\\hi\\there");
|
|
|
|
t!(s: Path::new("foo\\.."), ".");
|
|
|
|
t!(s: Path::new("\\foo\\.."), "\\");
|
|
|
|
t!(s: Path::new("\\foo\\..\\.."), "\\");
|
|
|
|
t!(s: Path::new("\\foo\\..\\..\\bar"), "\\bar");
|
|
|
|
t!(s: Path::new("\\.\\hi\\.\\there\\."), "\\hi\\there");
|
|
|
|
t!(s: Path::new("\\.\\hi\\.\\there\\.\\.."), "\\hi");
|
|
|
|
t!(s: Path::new("foo\\..\\.."), "..");
|
|
|
|
t!(s: Path::new("foo\\..\\..\\.."), "..\\..");
|
|
|
|
t!(s: Path::new("foo\\..\\..\\bar"), "..\\bar");
|
|
|
|
|
2014-04-12 20:56:23 +10:00
|
|
|
assert_eq!(Path::new(b!("foo\\bar")).into_vec().as_slice(), b!("foo\\bar"));
|
|
|
|
assert_eq!(Path::new(b!("\\foo\\..\\..\\bar")).into_vec().as_slice(), b!("\\bar"));
|
2013-10-05 19:49:32 -07:00
|
|
|
|
2013-12-03 19:15:12 -08:00
|
|
|
t!(s: Path::new("\\\\a"), "\\a");
|
|
|
|
t!(s: Path::new("\\\\a\\"), "\\a");
|
|
|
|
t!(s: Path::new("\\\\a\\b"), "\\\\a\\b");
|
|
|
|
t!(s: Path::new("\\\\a\\b\\"), "\\\\a\\b");
|
|
|
|
t!(s: Path::new("\\\\a\\b/"), "\\\\a\\b");
|
|
|
|
t!(s: Path::new("\\\\\\b"), "\\b");
|
|
|
|
t!(s: Path::new("\\\\a\\\\b"), "\\a\\b");
|
|
|
|
t!(s: Path::new("\\\\a\\b\\c"), "\\\\a\\b\\c");
|
|
|
|
t!(s: Path::new("\\\\server\\share/path"), "\\\\server\\share\\path");
|
|
|
|
t!(s: Path::new("\\\\server/share/path"), "\\\\server\\share\\path");
|
|
|
|
t!(s: Path::new("C:a\\b.txt"), "C:a\\b.txt");
|
|
|
|
t!(s: Path::new("C:a/b.txt"), "C:a\\b.txt");
|
|
|
|
t!(s: Path::new("z:\\a\\b.txt"), "Z:\\a\\b.txt");
|
|
|
|
t!(s: Path::new("z:/a/b.txt"), "Z:\\a\\b.txt");
|
|
|
|
t!(s: Path::new("ab:/a/b.txt"), "ab:\\a\\b.txt");
|
|
|
|
t!(s: Path::new("C:\\"), "C:\\");
|
|
|
|
t!(s: Path::new("C:"), "C:");
|
|
|
|
t!(s: Path::new("q:"), "Q:");
|
|
|
|
t!(s: Path::new("C:/"), "C:\\");
|
|
|
|
t!(s: Path::new("C:\\foo\\.."), "C:\\");
|
|
|
|
t!(s: Path::new("C:foo\\.."), "C:");
|
|
|
|
t!(s: Path::new("C:\\a\\"), "C:\\a");
|
|
|
|
t!(s: Path::new("C:\\a/"), "C:\\a");
|
|
|
|
t!(s: Path::new("C:\\a\\b\\"), "C:\\a\\b");
|
|
|
|
t!(s: Path::new("C:\\a\\b/"), "C:\\a\\b");
|
|
|
|
t!(s: Path::new("C:a\\"), "C:a");
|
|
|
|
t!(s: Path::new("C:a/"), "C:a");
|
|
|
|
t!(s: Path::new("C:a\\b\\"), "C:a\\b");
|
|
|
|
t!(s: Path::new("C:a\\b/"), "C:a\\b");
|
|
|
|
t!(s: Path::new("\\\\?\\z:\\a\\b.txt"), "\\\\?\\z:\\a\\b.txt");
|
|
|
|
t!(s: Path::new("\\\\?\\C:/a/b.txt"), "\\\\?\\C:/a/b.txt");
|
|
|
|
t!(s: Path::new("\\\\?\\C:\\a/b.txt"), "\\\\?\\C:\\a/b.txt");
|
|
|
|
t!(s: Path::new("\\\\?\\test\\a\\b.txt"), "\\\\?\\test\\a\\b.txt");
|
|
|
|
t!(s: Path::new("\\\\?\\foo\\bar\\"), "\\\\?\\foo\\bar\\");
|
|
|
|
t!(s: Path::new("\\\\.\\foo\\bar"), "\\\\.\\foo\\bar");
|
|
|
|
t!(s: Path::new("\\\\.\\"), "\\\\.\\");
|
|
|
|
t!(s: Path::new("\\\\?\\UNC\\server\\share\\foo"), "\\\\?\\UNC\\server\\share\\foo");
|
|
|
|
t!(s: Path::new("\\\\?\\UNC\\server/share"), "\\\\?\\UNC\\server/share\\");
|
|
|
|
t!(s: Path::new("\\\\?\\UNC\\server"), "\\\\?\\UNC\\server\\");
|
|
|
|
t!(s: Path::new("\\\\?\\UNC\\"), "\\\\?\\UNC\\\\");
|
|
|
|
t!(s: Path::new("\\\\?\\UNC"), "\\\\?\\UNC");
|
2013-08-27 00:51:08 -07:00
|
|
|
|
|
|
|
// I'm not sure whether \\.\foo/bar should normalize to \\.\foo\bar
|
|
|
|
// as information is sparse and this isn't really googleable.
|
|
|
|
// I'm going to err on the side of not normalizing it, as this skips the filesystem
|
2013-12-03 19:15:12 -08:00
|
|
|
t!(s: Path::new("\\\\.\\foo/bar"), "\\\\.\\foo/bar");
|
|
|
|
t!(s: Path::new("\\\\.\\foo\\bar"), "\\\\.\\foo\\bar");
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
2013-09-26 00:54:30 -07:00
|
|
|
#[test]
|
|
|
|
fn test_opt_paths() {
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(Path::new_opt(b!("foo\\bar", 0)) == None);
|
|
|
|
assert!(Path::new_opt(b!("foo\\bar", 0x80)) == None);
|
2013-12-03 19:15:12 -08:00
|
|
|
t!(v: Path::new_opt(b!("foo\\bar")).unwrap(), b!("foo\\bar"));
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(Path::new_opt("foo\\bar\0") == None);
|
2013-12-03 19:15:12 -08:00
|
|
|
t!(s: Path::new_opt("foo\\bar").unwrap(), "foo\\bar");
|
2013-09-26 00:54:30 -07:00
|
|
|
}
|
|
|
|
|
2013-08-27 00:51:08 -07:00
|
|
|
#[test]
|
|
|
|
fn test_null_byte() {
|
|
|
|
use task;
|
Remove std::condition
This has been a long time coming. Conditions in rust were initially envisioned
as being a good alternative to error code return pattern. The idea is that all
errors are fatal-by-default, and you can opt-in to handling the error by
registering an error handler.
While sounding nice, conditions ended up having some unforseen shortcomings:
* Actually handling an error has some very awkward syntax:
let mut result = None;
let mut answer = None;
io::io_error::cond.trap(|e| { result = Some(e) }).inside(|| {
answer = Some(some_io_operation());
});
match result {
Some(err) => { /* hit an I/O error */ }
None => {
let answer = answer.unwrap();
/* deal with the result of I/O */
}
}
This pattern can certainly use functions like io::result, but at its core
actually handling conditions is fairly difficult
* The "zero value" of a function is often confusing. One of the main ideas
behind using conditions was to change the signature of I/O functions. Instead
of read_be_u32() returning a result, it returned a u32. Errors were notified
via a condition, and if you caught the condition you understood that the "zero
value" returned is actually a garbage value. These zero values are often
difficult to understand, however.
One case of this is the read_bytes() function. The function takes an integer
length of the amount of bytes to read, and returns an array of that size. The
array may actually be shorter, however, if an error occurred.
Another case is fs::stat(). The theoretical "zero value" is a blank stat
struct, but it's a little awkward to create and return a zero'd out stat
struct on a call to stat().
In general, the return value of functions that can raise error are much more
natural when using a Result as opposed to an always-usable zero-value.
* Conditions impose a necessary runtime requirement on *all* I/O. In theory I/O
is as simple as calling read() and write(), but using conditions imposed the
restriction that a rust local task was required if you wanted to catch errors
with I/O. While certainly an surmountable difficulty, this was always a bit of
a thorn in the side of conditions.
* Functions raising conditions are not always clear that they are raising
conditions. This suffers a similar problem to exceptions where you don't
actually know whether a function raises a condition or not. The documentation
likely explains, but if someone retroactively adds a condition to a function
there's nothing forcing upstream users to acknowledge a new point of task
failure.
* Libaries using I/O are not guaranteed to correctly raise on conditions when an
error occurs. In developing various I/O libraries, it's much easier to just
return `None` from a read rather than raising an error. The silent contract of
"don't raise on EOF" was a little difficult to understand and threw a wrench
into the answer of the question "when do I raise a condition?"
Many of these difficulties can be overcome through documentation, examples, and
general practice. In the end, all of these difficulties added together ended up
being too overwhelming and improving various aspects didn't end up helping that
much.
A result-based I/O error handling strategy also has shortcomings, but the
cognitive burden is much smaller. The tooling necessary to make this strategy as
usable as conditions were is much smaller than the tooling necessary for
conditions.
Perhaps conditions may manifest themselves as a future entity, but for now
we're going to remove them from the standard library.
Closes #9795
Closes #8968
2014-02-04 19:02:10 -08:00
|
|
|
let result = task::try(proc() {
|
|
|
|
Path::new(b!("foo/bar", 0))
|
|
|
|
});
|
|
|
|
assert!(result.is_err());
|
2013-08-27 00:51:08 -07:00
|
|
|
|
Remove std::condition
This has been a long time coming. Conditions in rust were initially envisioned
as being a good alternative to error code return pattern. The idea is that all
errors are fatal-by-default, and you can opt-in to handling the error by
registering an error handler.
While sounding nice, conditions ended up having some unforseen shortcomings:
* Actually handling an error has some very awkward syntax:
let mut result = None;
let mut answer = None;
io::io_error::cond.trap(|e| { result = Some(e) }).inside(|| {
answer = Some(some_io_operation());
});
match result {
Some(err) => { /* hit an I/O error */ }
None => {
let answer = answer.unwrap();
/* deal with the result of I/O */
}
}
This pattern can certainly use functions like io::result, but at its core
actually handling conditions is fairly difficult
* The "zero value" of a function is often confusing. One of the main ideas
behind using conditions was to change the signature of I/O functions. Instead
of read_be_u32() returning a result, it returned a u32. Errors were notified
via a condition, and if you caught the condition you understood that the "zero
value" returned is actually a garbage value. These zero values are often
difficult to understand, however.
One case of this is the read_bytes() function. The function takes an integer
length of the amount of bytes to read, and returns an array of that size. The
array may actually be shorter, however, if an error occurred.
Another case is fs::stat(). The theoretical "zero value" is a blank stat
struct, but it's a little awkward to create and return a zero'd out stat
struct on a call to stat().
In general, the return value of functions that can raise error are much more
natural when using a Result as opposed to an always-usable zero-value.
* Conditions impose a necessary runtime requirement on *all* I/O. In theory I/O
is as simple as calling read() and write(), but using conditions imposed the
restriction that a rust local task was required if you wanted to catch errors
with I/O. While certainly an surmountable difficulty, this was always a bit of
a thorn in the side of conditions.
* Functions raising conditions are not always clear that they are raising
conditions. This suffers a similar problem to exceptions where you don't
actually know whether a function raises a condition or not. The documentation
likely explains, but if someone retroactively adds a condition to a function
there's nothing forcing upstream users to acknowledge a new point of task
failure.
* Libaries using I/O are not guaranteed to correctly raise on conditions when an
error occurs. In developing various I/O libraries, it's much easier to just
return `None` from a read rather than raising an error. The silent contract of
"don't raise on EOF" was a little difficult to understand and threw a wrench
into the answer of the question "when do I raise a condition?"
Many of these difficulties can be overcome through documentation, examples, and
general practice. In the end, all of these difficulties added together ended up
being too overwhelming and improving various aspects didn't end up helping that
much.
A result-based I/O error handling strategy also has shortcomings, but the
cognitive burden is much smaller. The tooling necessary to make this strategy as
usable as conditions were is much smaller than the tooling necessary for
conditions.
Perhaps conditions may manifest themselves as a future entity, but for now
we're going to remove them from the standard library.
Closes #9795
Closes #8968
2014-02-04 19:02:10 -08:00
|
|
|
let result = task::try(proc() {
|
|
|
|
Path::new("test").set_filename(b!("f", 0, "o"))
|
|
|
|
});
|
|
|
|
assert!(result.is_err());
|
2013-08-27 00:51:08 -07:00
|
|
|
|
Remove std::condition
This has been a long time coming. Conditions in rust were initially envisioned
as being a good alternative to error code return pattern. The idea is that all
errors are fatal-by-default, and you can opt-in to handling the error by
registering an error handler.
While sounding nice, conditions ended up having some unforseen shortcomings:
* Actually handling an error has some very awkward syntax:
let mut result = None;
let mut answer = None;
io::io_error::cond.trap(|e| { result = Some(e) }).inside(|| {
answer = Some(some_io_operation());
});
match result {
Some(err) => { /* hit an I/O error */ }
None => {
let answer = answer.unwrap();
/* deal with the result of I/O */
}
}
This pattern can certainly use functions like io::result, but at its core
actually handling conditions is fairly difficult
* The "zero value" of a function is often confusing. One of the main ideas
behind using conditions was to change the signature of I/O functions. Instead
of read_be_u32() returning a result, it returned a u32. Errors were notified
via a condition, and if you caught the condition you understood that the "zero
value" returned is actually a garbage value. These zero values are often
difficult to understand, however.
One case of this is the read_bytes() function. The function takes an integer
length of the amount of bytes to read, and returns an array of that size. The
array may actually be shorter, however, if an error occurred.
Another case is fs::stat(). The theoretical "zero value" is a blank stat
struct, but it's a little awkward to create and return a zero'd out stat
struct on a call to stat().
In general, the return value of functions that can raise error are much more
natural when using a Result as opposed to an always-usable zero-value.
* Conditions impose a necessary runtime requirement on *all* I/O. In theory I/O
is as simple as calling read() and write(), but using conditions imposed the
restriction that a rust local task was required if you wanted to catch errors
with I/O. While certainly an surmountable difficulty, this was always a bit of
a thorn in the side of conditions.
* Functions raising conditions are not always clear that they are raising
conditions. This suffers a similar problem to exceptions where you don't
actually know whether a function raises a condition or not. The documentation
likely explains, but if someone retroactively adds a condition to a function
there's nothing forcing upstream users to acknowledge a new point of task
failure.
* Libaries using I/O are not guaranteed to correctly raise on conditions when an
error occurs. In developing various I/O libraries, it's much easier to just
return `None` from a read rather than raising an error. The silent contract of
"don't raise on EOF" was a little difficult to understand and threw a wrench
into the answer of the question "when do I raise a condition?"
Many of these difficulties can be overcome through documentation, examples, and
general practice. In the end, all of these difficulties added together ended up
being too overwhelming and improving various aspects didn't end up helping that
much.
A result-based I/O error handling strategy also has shortcomings, but the
cognitive burden is much smaller. The tooling necessary to make this strategy as
usable as conditions were is much smaller than the tooling necessary for
conditions.
Perhaps conditions may manifest themselves as a future entity, but for now
we're going to remove them from the standard library.
Closes #9795
Closes #8968
2014-02-04 19:02:10 -08:00
|
|
|
let result = task::try(proc() {
|
|
|
|
Path::new("test").push(b!("f", 0, "o"));
|
|
|
|
});
|
|
|
|
assert!(result.is_err());
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
#[should_fail]
|
|
|
|
fn test_not_utf8_fail() {
|
2013-12-03 19:15:12 -08:00
|
|
|
Path::new(b!("hello", 0x80, ".txt"));
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
2013-09-26 02:10:16 -07:00
|
|
|
#[test]
|
|
|
|
fn test_display_str() {
|
2013-12-03 19:15:12 -08:00
|
|
|
let path = Path::new("foo");
|
2014-05-25 03:17:19 -07:00
|
|
|
assert_eq!(path.display().to_str(), "foo".to_string());
|
2013-12-03 19:15:12 -08:00
|
|
|
let path = Path::new(b!("\\"));
|
2014-05-25 03:17:19 -07:00
|
|
|
assert_eq!(path.filename_display().to_str(), "".to_string());
|
2013-09-26 02:10:16 -07:00
|
|
|
|
2013-12-03 19:15:12 -08:00
|
|
|
let path = Path::new("foo");
|
2014-02-07 19:45:48 -08:00
|
|
|
let mo = path.display().as_maybe_owned();
|
|
|
|
assert_eq!(mo.as_slice(), "foo");
|
2013-12-03 19:15:12 -08:00
|
|
|
let path = Path::new(b!("\\"));
|
2014-02-07 19:45:48 -08:00
|
|
|
let mo = path.filename_display().as_maybe_owned();
|
|
|
|
assert_eq!(mo.as_slice(), "");
|
2013-09-26 02:10:16 -07:00
|
|
|
}
|
|
|
|
|
2013-10-01 14:03:41 -07:00
|
|
|
#[test]
|
|
|
|
fn test_display() {
|
|
|
|
macro_rules! t(
|
|
|
|
($path:expr, $exp:expr, $expf:expr) => (
|
|
|
|
{
|
2013-12-03 19:15:12 -08:00
|
|
|
let path = Path::new($path);
|
2013-10-01 14:03:41 -07:00
|
|
|
let f = format!("{}", path.display());
|
|
|
|
assert_eq!(f.as_slice(), $exp);
|
|
|
|
let f = format!("{}", path.filename_display());
|
|
|
|
assert_eq!(f.as_slice(), $expf);
|
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
t!("foo", "foo", "foo");
|
|
|
|
t!("foo\\bar", "foo\\bar", "bar");
|
|
|
|
t!("\\", "\\", "");
|
|
|
|
}
|
|
|
|
|
2013-08-27 00:51:08 -07:00
|
|
|
#[test]
|
|
|
|
fn test_components() {
|
|
|
|
macro_rules! t(
|
|
|
|
(s: $path:expr, $op:ident, $exp:expr) => (
|
|
|
|
{
|
2014-01-15 14:39:08 -05:00
|
|
|
let path = $path;
|
|
|
|
let path = Path::new(path);
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(path.$op() == Some($exp));
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
);
|
|
|
|
(s: $path:expr, $op:ident, $exp:expr, opt) => (
|
|
|
|
{
|
2014-01-15 14:39:08 -05:00
|
|
|
let path = $path;
|
|
|
|
let path = Path::new(path);
|
2013-08-27 00:51:08 -07:00
|
|
|
let left = path.$op();
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(left == $exp);
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
);
|
|
|
|
(v: $path:expr, $op:ident, $exp:expr) => (
|
|
|
|
{
|
2014-01-15 14:39:08 -05:00
|
|
|
let path = $path;
|
|
|
|
let path = Path::new(path);
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(path.$op() == $exp);
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
2013-09-26 17:21:59 -07:00
|
|
|
t!(v: b!("a\\b\\c"), filename, Some(b!("c")));
|
2013-08-27 00:51:08 -07:00
|
|
|
t!(s: "a\\b\\c", filename_str, "c");
|
|
|
|
t!(s: "\\a\\b\\c", filename_str, "c");
|
|
|
|
t!(s: "a", filename_str, "a");
|
|
|
|
t!(s: "\\a", filename_str, "a");
|
2013-09-26 17:21:59 -07:00
|
|
|
t!(s: ".", filename_str, None, opt);
|
|
|
|
t!(s: "\\", filename_str, None, opt);
|
|
|
|
t!(s: "..", filename_str, None, opt);
|
|
|
|
t!(s: "..\\..", filename_str, None, opt);
|
2013-08-27 00:51:08 -07:00
|
|
|
t!(s: "c:\\foo.txt", filename_str, "foo.txt");
|
2013-09-26 17:21:59 -07:00
|
|
|
t!(s: "C:\\", filename_str, None, opt);
|
|
|
|
t!(s: "C:", filename_str, None, opt);
|
2013-08-27 00:51:08 -07:00
|
|
|
t!(s: "\\\\server\\share\\foo.txt", filename_str, "foo.txt");
|
2013-09-26 17:21:59 -07:00
|
|
|
t!(s: "\\\\server\\share", filename_str, None, opt);
|
2013-08-27 00:51:08 -07:00
|
|
|
t!(s: "\\\\server", filename_str, "server");
|
|
|
|
t!(s: "\\\\?\\bar\\foo.txt", filename_str, "foo.txt");
|
2013-09-26 17:21:59 -07:00
|
|
|
t!(s: "\\\\?\\bar", filename_str, None, opt);
|
|
|
|
t!(s: "\\\\?\\", filename_str, None, opt);
|
2013-08-27 00:51:08 -07:00
|
|
|
t!(s: "\\\\?\\UNC\\server\\share\\foo.txt", filename_str, "foo.txt");
|
2013-09-26 17:21:59 -07:00
|
|
|
t!(s: "\\\\?\\UNC\\server", filename_str, None, opt);
|
|
|
|
t!(s: "\\\\?\\UNC\\", filename_str, None, opt);
|
2013-08-27 00:51:08 -07:00
|
|
|
t!(s: "\\\\?\\C:\\foo.txt", filename_str, "foo.txt");
|
2013-09-26 17:21:59 -07:00
|
|
|
t!(s: "\\\\?\\C:\\", filename_str, None, opt);
|
|
|
|
t!(s: "\\\\?\\C:", filename_str, None, opt);
|
|
|
|
t!(s: "\\\\?\\foo/bar", filename_str, None, opt);
|
|
|
|
t!(s: "\\\\?\\C:/foo", filename_str, None, opt);
|
2013-08-27 00:51:08 -07:00
|
|
|
t!(s: "\\\\.\\foo\\bar", filename_str, "bar");
|
2013-09-26 17:21:59 -07:00
|
|
|
t!(s: "\\\\.\\foo", filename_str, None, opt);
|
|
|
|
t!(s: "\\\\.\\foo/bar", filename_str, None, opt);
|
2013-08-27 00:51:08 -07:00
|
|
|
t!(s: "\\\\.\\foo\\bar/baz", filename_str, "bar/baz");
|
2013-09-26 17:21:59 -07:00
|
|
|
t!(s: "\\\\.\\", filename_str, None, opt);
|
2013-08-27 00:51:08 -07:00
|
|
|
t!(s: "\\\\?\\a\\b\\", filename_str, "b");
|
|
|
|
|
|
|
|
t!(v: b!("a\\b\\c"), dirname, b!("a\\b"));
|
|
|
|
t!(s: "a\\b\\c", dirname_str, "a\\b");
|
|
|
|
t!(s: "\\a\\b\\c", dirname_str, "\\a\\b");
|
|
|
|
t!(s: "a", dirname_str, ".");
|
|
|
|
t!(s: "\\a", dirname_str, "\\");
|
|
|
|
t!(s: ".", dirname_str, ".");
|
|
|
|
t!(s: "\\", dirname_str, "\\");
|
|
|
|
t!(s: "..", dirname_str, "..");
|
|
|
|
t!(s: "..\\..", dirname_str, "..\\..");
|
|
|
|
t!(s: "c:\\foo.txt", dirname_str, "C:\\");
|
|
|
|
t!(s: "C:\\", dirname_str, "C:\\");
|
|
|
|
t!(s: "C:", dirname_str, "C:");
|
|
|
|
t!(s: "C:foo.txt", dirname_str, "C:");
|
|
|
|
t!(s: "\\\\server\\share\\foo.txt", dirname_str, "\\\\server\\share");
|
|
|
|
t!(s: "\\\\server\\share", dirname_str, "\\\\server\\share");
|
|
|
|
t!(s: "\\\\server", dirname_str, "\\");
|
|
|
|
t!(s: "\\\\?\\bar\\foo.txt", dirname_str, "\\\\?\\bar");
|
|
|
|
t!(s: "\\\\?\\bar", dirname_str, "\\\\?\\bar");
|
|
|
|
t!(s: "\\\\?\\", dirname_str, "\\\\?\\");
|
|
|
|
t!(s: "\\\\?\\UNC\\server\\share\\foo.txt", dirname_str, "\\\\?\\UNC\\server\\share");
|
|
|
|
t!(s: "\\\\?\\UNC\\server", dirname_str, "\\\\?\\UNC\\server\\");
|
|
|
|
t!(s: "\\\\?\\UNC\\", dirname_str, "\\\\?\\UNC\\\\");
|
|
|
|
t!(s: "\\\\?\\C:\\foo.txt", dirname_str, "\\\\?\\C:\\");
|
|
|
|
t!(s: "\\\\?\\C:\\", dirname_str, "\\\\?\\C:\\");
|
|
|
|
t!(s: "\\\\?\\C:", dirname_str, "\\\\?\\C:");
|
|
|
|
t!(s: "\\\\?\\C:/foo/bar", dirname_str, "\\\\?\\C:/foo/bar");
|
|
|
|
t!(s: "\\\\?\\foo/bar", dirname_str, "\\\\?\\foo/bar");
|
|
|
|
t!(s: "\\\\.\\foo\\bar", dirname_str, "\\\\.\\foo");
|
|
|
|
t!(s: "\\\\.\\foo", dirname_str, "\\\\.\\foo");
|
|
|
|
t!(s: "\\\\?\\a\\b\\", dirname_str, "\\\\?\\a");
|
|
|
|
|
2013-09-26 17:21:59 -07:00
|
|
|
t!(v: b!("hi\\there.txt"), filestem, Some(b!("there")));
|
2013-08-27 00:51:08 -07:00
|
|
|
t!(s: "hi\\there.txt", filestem_str, "there");
|
|
|
|
t!(s: "hi\\there", filestem_str, "there");
|
|
|
|
t!(s: "there.txt", filestem_str, "there");
|
|
|
|
t!(s: "there", filestem_str, "there");
|
2013-09-26 17:21:59 -07:00
|
|
|
t!(s: ".", filestem_str, None, opt);
|
|
|
|
t!(s: "\\", filestem_str, None, opt);
|
2013-08-27 00:51:08 -07:00
|
|
|
t!(s: "foo\\.bar", filestem_str, ".bar");
|
|
|
|
t!(s: ".bar", filestem_str, ".bar");
|
|
|
|
t!(s: "..bar", filestem_str, ".");
|
|
|
|
t!(s: "hi\\there..txt", filestem_str, "there.");
|
2013-09-26 17:21:59 -07:00
|
|
|
t!(s: "..", filestem_str, None, opt);
|
|
|
|
t!(s: "..\\..", filestem_str, None, opt);
|
2013-08-27 00:51:08 -07:00
|
|
|
// filestem is based on filename, so we don't need the full set of prefix tests
|
|
|
|
|
|
|
|
t!(v: b!("hi\\there.txt"), extension, Some(b!("txt")));
|
|
|
|
t!(v: b!("hi\\there"), extension, None);
|
|
|
|
t!(s: "hi\\there.txt", extension_str, Some("txt"), opt);
|
|
|
|
t!(s: "hi\\there", extension_str, None, opt);
|
|
|
|
t!(s: "there.txt", extension_str, Some("txt"), opt);
|
|
|
|
t!(s: "there", extension_str, None, opt);
|
|
|
|
t!(s: ".", extension_str, None, opt);
|
|
|
|
t!(s: "\\", extension_str, None, opt);
|
|
|
|
t!(s: "foo\\.bar", extension_str, None, opt);
|
|
|
|
t!(s: ".bar", extension_str, None, opt);
|
|
|
|
t!(s: "..bar", extension_str, Some("bar"), opt);
|
|
|
|
t!(s: "hi\\there..txt", extension_str, Some("txt"), opt);
|
|
|
|
t!(s: "..", extension_str, None, opt);
|
|
|
|
t!(s: "..\\..", extension_str, None, opt);
|
|
|
|
// extension is based on filename, so we don't need the full set of prefix tests
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_push() {
|
|
|
|
macro_rules! t(
|
|
|
|
(s: $path:expr, $join:expr) => (
|
|
|
|
{
|
2014-02-26 12:55:23 -08:00
|
|
|
let path = $path;
|
|
|
|
let join = $join;
|
2013-12-03 19:15:12 -08:00
|
|
|
let mut p1 = Path::new(path);
|
2013-08-27 00:51:08 -07:00
|
|
|
let p2 = p1.clone();
|
2013-10-05 19:49:32 -07:00
|
|
|
p1.push(join);
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(p1 == p2.join(join));
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
t!(s: "a\\b\\c", "..");
|
|
|
|
t!(s: "\\a\\b\\c", "d");
|
|
|
|
t!(s: "a\\b", "c\\d");
|
|
|
|
t!(s: "a\\b", "\\c\\d");
|
2013-10-05 19:49:32 -07:00
|
|
|
// this is just a sanity-check test. push and join share an implementation,
|
2013-08-27 00:51:08 -07:00
|
|
|
// so there's no need for the full set of prefix tests
|
|
|
|
|
|
|
|
// we do want to check one odd case though to ensure the prefix is re-parsed
|
2013-12-03 19:15:12 -08:00
|
|
|
let mut p = Path::new("\\\\?\\C:");
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(prefix(&p) == Some(VerbatimPrefix(2)));
|
2013-10-05 19:49:32 -07:00
|
|
|
p.push("foo");
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(prefix(&p) == Some(VerbatimDiskPrefix));
|
2013-08-27 00:51:08 -07:00
|
|
|
assert_eq!(p.as_str(), Some("\\\\?\\C:\\foo"));
|
|
|
|
|
|
|
|
// and another with verbatim non-normalized paths
|
2013-12-03 19:15:12 -08:00
|
|
|
let mut p = Path::new("\\\\?\\C:\\a\\");
|
2013-10-05 19:49:32 -07:00
|
|
|
p.push("foo");
|
2013-08-27 00:51:08 -07:00
|
|
|
assert_eq!(p.as_str(), Some("\\\\?\\C:\\a\\foo"));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_push_path() {
|
|
|
|
macro_rules! t(
|
|
|
|
(s: $path:expr, $push:expr, $exp:expr) => (
|
|
|
|
{
|
2013-12-03 19:15:12 -08:00
|
|
|
let mut p = Path::new($path);
|
|
|
|
let push = Path::new($push);
|
2013-10-07 19:16:58 -07:00
|
|
|
p.push(&push);
|
2013-08-27 00:51:08 -07:00
|
|
|
assert_eq!(p.as_str(), Some($exp));
|
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
t!(s: "a\\b\\c", "d", "a\\b\\c\\d");
|
|
|
|
t!(s: "\\a\\b\\c", "d", "\\a\\b\\c\\d");
|
|
|
|
t!(s: "a\\b", "c\\d", "a\\b\\c\\d");
|
|
|
|
t!(s: "a\\b", "\\c\\d", "\\c\\d");
|
|
|
|
t!(s: "a\\b", ".", "a\\b");
|
|
|
|
t!(s: "a\\b", "..\\c", "a\\c");
|
|
|
|
t!(s: "a\\b", "C:a.txt", "C:a.txt");
|
|
|
|
t!(s: "a\\b", "..\\..\\..\\c", "..\\c");
|
|
|
|
t!(s: "a\\b", "C:\\a.txt", "C:\\a.txt");
|
|
|
|
t!(s: "C:\\a", "C:\\b.txt", "C:\\b.txt");
|
|
|
|
t!(s: "C:\\a\\b\\c", "C:d", "C:\\a\\b\\c\\d");
|
|
|
|
t!(s: "C:a\\b\\c", "C:d", "C:a\\b\\c\\d");
|
|
|
|
t!(s: "C:a\\b", "..\\..\\..\\c", "C:..\\c");
|
|
|
|
t!(s: "C:\\a\\b", "..\\..\\..\\c", "C:\\c");
|
2014-01-15 12:53:56 -08:00
|
|
|
t!(s: "C:", r"a\b\c", r"C:a\b\c");
|
|
|
|
t!(s: "C:", r"..\a", r"C:..\a");
|
2013-08-27 00:51:08 -07:00
|
|
|
t!(s: "\\\\server\\share\\foo", "bar", "\\\\server\\share\\foo\\bar");
|
|
|
|
t!(s: "\\\\server\\share\\foo", "..\\..\\bar", "\\\\server\\share\\bar");
|
|
|
|
t!(s: "\\\\server\\share\\foo", "C:baz", "C:baz");
|
|
|
|
t!(s: "\\\\?\\C:\\a\\b", "C:c\\d", "\\\\?\\C:\\a\\b\\c\\d");
|
|
|
|
t!(s: "\\\\?\\C:a\\b", "C:c\\d", "C:c\\d");
|
|
|
|
t!(s: "\\\\?\\C:\\a\\b", "C:\\c\\d", "C:\\c\\d");
|
|
|
|
t!(s: "\\\\?\\foo\\bar", "baz", "\\\\?\\foo\\bar\\baz");
|
|
|
|
t!(s: "\\\\?\\C:\\a\\b", "..\\..\\..\\c", "\\\\?\\C:\\a\\b\\..\\..\\..\\c");
|
|
|
|
t!(s: "\\\\?\\foo\\bar", "..\\..\\c", "\\\\?\\foo\\bar\\..\\..\\c");
|
|
|
|
t!(s: "\\\\?\\", "foo", "\\\\?\\\\foo");
|
|
|
|
t!(s: "\\\\?\\UNC\\server\\share\\foo", "bar", "\\\\?\\UNC\\server\\share\\foo\\bar");
|
|
|
|
t!(s: "\\\\?\\UNC\\server\\share", "C:\\a", "C:\\a");
|
|
|
|
t!(s: "\\\\?\\UNC\\server\\share", "C:a", "C:a");
|
|
|
|
t!(s: "\\\\?\\UNC\\server", "foo", "\\\\?\\UNC\\server\\\\foo");
|
|
|
|
t!(s: "C:\\a", "\\\\?\\UNC\\server\\share", "\\\\?\\UNC\\server\\share");
|
|
|
|
t!(s: "\\\\.\\foo\\bar", "baz", "\\\\.\\foo\\bar\\baz");
|
|
|
|
t!(s: "\\\\.\\foo\\bar", "C:a", "C:a");
|
|
|
|
// again, not sure about the following, but I'm assuming \\.\ should be verbatim
|
|
|
|
t!(s: "\\\\.\\foo", "..\\bar", "\\\\.\\foo\\..\\bar");
|
|
|
|
|
|
|
|
t!(s: "\\\\?\\C:", "foo", "\\\\?\\C:\\foo"); // this is a weird one
|
|
|
|
}
|
|
|
|
|
2013-09-26 17:21:59 -07:00
|
|
|
#[test]
|
|
|
|
fn test_push_many() {
|
|
|
|
macro_rules! t(
|
|
|
|
(s: $path:expr, $push:expr, $exp:expr) => (
|
|
|
|
{
|
2013-12-03 19:15:12 -08:00
|
|
|
let mut p = Path::new($path);
|
2013-10-05 19:49:32 -07:00
|
|
|
p.push_many($push);
|
2013-09-26 17:21:59 -07:00
|
|
|
assert_eq!(p.as_str(), Some($exp));
|
|
|
|
}
|
|
|
|
);
|
|
|
|
(v: $path:expr, $push:expr, $exp:expr) => (
|
|
|
|
{
|
2013-12-03 19:15:12 -08:00
|
|
|
let mut p = Path::new($path);
|
2013-09-26 17:21:59 -07:00
|
|
|
p.push_many($push);
|
|
|
|
assert_eq!(p.as_vec(), $exp);
|
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
t!(s: "a\\b\\c", ["d", "e"], "a\\b\\c\\d\\e");
|
|
|
|
t!(s: "a\\b\\c", ["d", "\\e"], "\\e");
|
|
|
|
t!(s: "a\\b\\c", ["d", "\\e", "f"], "\\e\\f");
|
2014-05-25 03:17:19 -07:00
|
|
|
t!(s: "a\\b\\c", ["d".to_string(), "e".to_string()], "a\\b\\c\\d\\e");
|
2013-09-26 17:21:59 -07:00
|
|
|
t!(v: b!("a\\b\\c"), [b!("d"), b!("e")], b!("a\\b\\c\\d\\e"));
|
|
|
|
t!(v: b!("a\\b\\c"), [b!("d"), b!("\\e"), b!("f")], b!("\\e\\f"));
|
2014-04-12 20:56:23 +10:00
|
|
|
t!(v: b!("a\\b\\c"), [Vec::from_slice(b!("d")), Vec::from_slice(b!("e"))],
|
|
|
|
b!("a\\b\\c\\d\\e"));
|
2013-09-26 17:21:59 -07:00
|
|
|
}
|
|
|
|
|
2013-08-27 00:51:08 -07:00
|
|
|
#[test]
|
|
|
|
fn test_pop() {
|
|
|
|
macro_rules! t(
|
|
|
|
(s: $path:expr, $left:expr, $right:expr) => (
|
|
|
|
{
|
|
|
|
let pstr = $path;
|
2013-12-03 19:15:12 -08:00
|
|
|
let mut p = Path::new(pstr);
|
2013-10-09 22:05:14 -07:00
|
|
|
let result = p.pop();
|
2013-08-27 00:51:08 -07:00
|
|
|
let left = $left;
|
|
|
|
assert!(p.as_str() == Some(left),
|
2013-10-01 23:41:59 -07:00
|
|
|
"`{}`.pop() failed; expected remainder `{}`, found `{}`",
|
2013-08-27 00:51:08 -07:00
|
|
|
pstr, left, p.as_str().unwrap());
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(result == $right);
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
);
|
2013-10-09 22:05:14 -07:00
|
|
|
(v: [$($path:expr),+], [$($left:expr),+], $right:expr) => (
|
2013-08-27 00:51:08 -07:00
|
|
|
{
|
2013-12-03 19:15:12 -08:00
|
|
|
let mut p = Path::new(b!($($path),+));
|
2013-10-09 22:05:14 -07:00
|
|
|
let result = p.pop();
|
2013-08-27 00:51:08 -07:00
|
|
|
assert_eq!(p.as_vec(), b!($($left),+));
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(result == $right);
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
2013-10-09 22:05:14 -07:00
|
|
|
t!(s: "a\\b\\c", "a\\b", true);
|
|
|
|
t!(s: "a", ".", true);
|
|
|
|
t!(s: ".", ".", false);
|
|
|
|
t!(s: "\\a", "\\", true);
|
|
|
|
t!(s: "\\", "\\", false);
|
|
|
|
t!(v: ["a\\b\\c"], ["a\\b"], true);
|
|
|
|
t!(v: ["a"], ["."], true);
|
|
|
|
t!(v: ["."], ["."], false);
|
|
|
|
t!(v: ["\\a"], ["\\"], true);
|
|
|
|
t!(v: ["\\"], ["\\"], false);
|
|
|
|
|
|
|
|
t!(s: "C:\\a\\b", "C:\\a", true);
|
|
|
|
t!(s: "C:\\a", "C:\\", true);
|
|
|
|
t!(s: "C:\\", "C:\\", false);
|
|
|
|
t!(s: "C:a\\b", "C:a", true);
|
|
|
|
t!(s: "C:a", "C:", true);
|
|
|
|
t!(s: "C:", "C:", false);
|
|
|
|
t!(s: "\\\\server\\share\\a\\b", "\\\\server\\share\\a", true);
|
|
|
|
t!(s: "\\\\server\\share\\a", "\\\\server\\share", true);
|
|
|
|
t!(s: "\\\\server\\share", "\\\\server\\share", false);
|
|
|
|
t!(s: "\\\\?\\a\\b\\c", "\\\\?\\a\\b", true);
|
|
|
|
t!(s: "\\\\?\\a\\b", "\\\\?\\a", true);
|
|
|
|
t!(s: "\\\\?\\a", "\\\\?\\a", false);
|
|
|
|
t!(s: "\\\\?\\C:\\a\\b", "\\\\?\\C:\\a", true);
|
|
|
|
t!(s: "\\\\?\\C:\\a", "\\\\?\\C:\\", true);
|
|
|
|
t!(s: "\\\\?\\C:\\", "\\\\?\\C:\\", false);
|
|
|
|
t!(s: "\\\\?\\UNC\\server\\share\\a\\b", "\\\\?\\UNC\\server\\share\\a", true);
|
|
|
|
t!(s: "\\\\?\\UNC\\server\\share\\a", "\\\\?\\UNC\\server\\share", true);
|
|
|
|
t!(s: "\\\\?\\UNC\\server\\share", "\\\\?\\UNC\\server\\share", false);
|
|
|
|
t!(s: "\\\\.\\a\\b\\c", "\\\\.\\a\\b", true);
|
|
|
|
t!(s: "\\\\.\\a\\b", "\\\\.\\a", true);
|
|
|
|
t!(s: "\\\\.\\a", "\\\\.\\a", false);
|
|
|
|
|
|
|
|
t!(s: "\\\\?\\a\\b\\", "\\\\?\\a", true);
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
2013-09-26 17:21:59 -07:00
|
|
|
#[test]
|
|
|
|
fn test_root_path() {
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(Path::new("a\\b\\c").root_path() == None);
|
|
|
|
assert!(Path::new("\\a\\b\\c").root_path() == Some(Path::new("\\")));
|
|
|
|
assert!(Path::new("C:a").root_path() == Some(Path::new("C:")));
|
|
|
|
assert!(Path::new("C:\\a").root_path() == Some(Path::new("C:\\")));
|
|
|
|
assert!(Path::new("\\\\a\\b\\c").root_path() == Some(Path::new("\\\\a\\b")));
|
|
|
|
assert!(Path::new("\\\\?\\a\\b").root_path() == Some(Path::new("\\\\?\\a")));
|
|
|
|
assert!(Path::new("\\\\?\\C:\\a").root_path() == Some(Path::new("\\\\?\\C:\\")));
|
|
|
|
assert!(Path::new("\\\\?\\UNC\\a\\b\\c").root_path() ==
|
|
|
|
Some(Path::new("\\\\?\\UNC\\a\\b")));
|
|
|
|
assert!(Path::new("\\\\.\\a\\b").root_path() == Some(Path::new("\\\\.\\a")));
|
2013-09-26 17:21:59 -07:00
|
|
|
}
|
|
|
|
|
2013-08-27 00:51:08 -07:00
|
|
|
#[test]
|
|
|
|
fn test_join() {
|
2013-12-03 19:15:12 -08:00
|
|
|
t!(s: Path::new("a\\b\\c").join(".."), "a\\b");
|
|
|
|
t!(s: Path::new("\\a\\b\\c").join("d"), "\\a\\b\\c\\d");
|
|
|
|
t!(s: Path::new("a\\b").join("c\\d"), "a\\b\\c\\d");
|
|
|
|
t!(s: Path::new("a\\b").join("\\c\\d"), "\\c\\d");
|
|
|
|
t!(s: Path::new(".").join("a\\b"), "a\\b");
|
|
|
|
t!(s: Path::new("\\").join("a\\b"), "\\a\\b");
|
|
|
|
t!(v: Path::new(b!("a\\b\\c")).join(b!("..")), b!("a\\b"));
|
|
|
|
t!(v: Path::new(b!("\\a\\b\\c")).join(b!("d")), b!("\\a\\b\\c\\d"));
|
2013-08-27 00:51:08 -07:00
|
|
|
// full join testing is covered under test_push_path, so no need for
|
|
|
|
// the full set of prefix tests
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_join_path() {
|
|
|
|
macro_rules! t(
|
|
|
|
(s: $path:expr, $join:expr, $exp:expr) => (
|
|
|
|
{
|
2013-12-03 19:15:12 -08:00
|
|
|
let path = Path::new($path);
|
|
|
|
let join = Path::new($join);
|
2013-10-07 19:16:58 -07:00
|
|
|
let res = path.join(&join);
|
2013-08-27 00:51:08 -07:00
|
|
|
assert_eq!(res.as_str(), Some($exp));
|
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
t!(s: "a\\b\\c", "..", "a\\b");
|
|
|
|
t!(s: "\\a\\b\\c", "d", "\\a\\b\\c\\d");
|
|
|
|
t!(s: "a\\b", "c\\d", "a\\b\\c\\d");
|
|
|
|
t!(s: "a\\b", "\\c\\d", "\\c\\d");
|
|
|
|
t!(s: ".", "a\\b", "a\\b");
|
|
|
|
t!(s: "\\", "a\\b", "\\a\\b");
|
2013-10-07 19:16:58 -07:00
|
|
|
// join is implemented using push, so there's no need for
|
2013-08-27 00:51:08 -07:00
|
|
|
// the full set of prefix tests
|
|
|
|
}
|
|
|
|
|
2013-09-26 17:21:59 -07:00
|
|
|
#[test]
|
|
|
|
fn test_join_many() {
|
|
|
|
macro_rules! t(
|
|
|
|
(s: $path:expr, $join:expr, $exp:expr) => (
|
|
|
|
{
|
2013-12-03 19:15:12 -08:00
|
|
|
let path = Path::new($path);
|
2013-10-05 19:49:32 -07:00
|
|
|
let res = path.join_many($join);
|
2013-09-26 17:21:59 -07:00
|
|
|
assert_eq!(res.as_str(), Some($exp));
|
|
|
|
}
|
|
|
|
);
|
|
|
|
(v: $path:expr, $join:expr, $exp:expr) => (
|
|
|
|
{
|
2013-12-03 19:15:12 -08:00
|
|
|
let path = Path::new($path);
|
2013-09-26 17:21:59 -07:00
|
|
|
let res = path.join_many($join);
|
|
|
|
assert_eq!(res.as_vec(), $exp);
|
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
t!(s: "a\\b\\c", ["d", "e"], "a\\b\\c\\d\\e");
|
|
|
|
t!(s: "a\\b\\c", ["..", "d"], "a\\b\\d");
|
|
|
|
t!(s: "a\\b\\c", ["d", "\\e", "f"], "\\e\\f");
|
2014-05-25 03:17:19 -07:00
|
|
|
t!(s: "a\\b\\c", ["d".to_string(), "e".to_string()], "a\\b\\c\\d\\e");
|
2013-09-26 17:21:59 -07:00
|
|
|
t!(v: b!("a\\b\\c"), [b!("d"), b!("e")], b!("a\\b\\c\\d\\e"));
|
2014-04-12 20:56:23 +10:00
|
|
|
t!(v: b!("a\\b\\c"), [Vec::from_slice(b!("d")), Vec::from_slice(b!("e"))],
|
|
|
|
b!("a\\b\\c\\d\\e"));
|
2013-09-26 17:21:59 -07:00
|
|
|
}
|
|
|
|
|
2013-08-27 00:51:08 -07:00
|
|
|
#[test]
|
|
|
|
fn test_with_helpers() {
|
|
|
|
macro_rules! t(
|
|
|
|
(s: $path:expr, $op:ident, $arg:expr, $res:expr) => (
|
|
|
|
{
|
|
|
|
let pstr = $path;
|
2013-12-03 19:15:12 -08:00
|
|
|
let path = Path::new(pstr);
|
2013-08-27 00:51:08 -07:00
|
|
|
let arg = $arg;
|
|
|
|
let res = path.$op(arg);
|
|
|
|
let exp = $res;
|
|
|
|
assert!(res.as_str() == Some(exp),
|
2013-10-01 23:41:59 -07:00
|
|
|
"`{}`.{}(\"{}\"): Expected `{}`, found `{}`",
|
2013-08-27 00:51:08 -07:00
|
|
|
pstr, stringify!($op), arg, exp, res.as_str().unwrap());
|
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
2013-10-05 19:49:32 -07:00
|
|
|
|
|
|
|
t!(s: "a\\b\\c", with_filename, "d", "a\\b\\d");
|
|
|
|
t!(s: ".", with_filename, "foo", "foo");
|
|
|
|
t!(s: "\\a\\b\\c", with_filename, "d", "\\a\\b\\d");
|
|
|
|
t!(s: "\\", with_filename, "foo", "\\foo");
|
|
|
|
t!(s: "\\a", with_filename, "foo", "\\foo");
|
|
|
|
t!(s: "foo", with_filename, "bar", "bar");
|
|
|
|
t!(s: "\\", with_filename, "foo\\", "\\foo");
|
|
|
|
t!(s: "\\a", with_filename, "foo\\", "\\foo");
|
|
|
|
t!(s: "a\\b\\c", with_filename, "", "a\\b");
|
|
|
|
t!(s: "a\\b\\c", with_filename, ".", "a\\b");
|
|
|
|
t!(s: "a\\b\\c", with_filename, "..", "a");
|
|
|
|
t!(s: "\\a", with_filename, "", "\\");
|
|
|
|
t!(s: "foo", with_filename, "", ".");
|
|
|
|
t!(s: "a\\b\\c", with_filename, "d\\e", "a\\b\\d\\e");
|
|
|
|
t!(s: "a\\b\\c", with_filename, "\\d", "a\\b\\d");
|
|
|
|
t!(s: "..", with_filename, "foo", "..\\foo");
|
|
|
|
t!(s: "..\\..", with_filename, "foo", "..\\..\\foo");
|
|
|
|
t!(s: "..", with_filename, "", "..");
|
|
|
|
t!(s: "..\\..", with_filename, "", "..\\..");
|
|
|
|
t!(s: "C:\\foo\\bar", with_filename, "baz", "C:\\foo\\baz");
|
|
|
|
t!(s: "C:\\foo", with_filename, "bar", "C:\\bar");
|
|
|
|
t!(s: "C:\\", with_filename, "foo", "C:\\foo");
|
|
|
|
t!(s: "C:foo\\bar", with_filename, "baz", "C:foo\\baz");
|
|
|
|
t!(s: "C:foo", with_filename, "bar", "C:bar");
|
|
|
|
t!(s: "C:", with_filename, "foo", "C:foo");
|
|
|
|
t!(s: "C:\\foo", with_filename, "", "C:\\");
|
|
|
|
t!(s: "C:foo", with_filename, "", "C:");
|
|
|
|
t!(s: "C:\\foo\\bar", with_filename, "..", "C:\\");
|
|
|
|
t!(s: "C:\\foo", with_filename, "..", "C:\\");
|
|
|
|
t!(s: "C:\\", with_filename, "..", "C:\\");
|
|
|
|
t!(s: "C:foo\\bar", with_filename, "..", "C:");
|
|
|
|
t!(s: "C:foo", with_filename, "..", "C:..");
|
|
|
|
t!(s: "C:", with_filename, "..", "C:..");
|
|
|
|
t!(s: "\\\\server\\share\\foo", with_filename, "bar", "\\\\server\\share\\bar");
|
|
|
|
t!(s: "\\\\server\\share", with_filename, "foo", "\\\\server\\share\\foo");
|
|
|
|
t!(s: "\\\\server\\share\\foo", with_filename, "", "\\\\server\\share");
|
|
|
|
t!(s: "\\\\server\\share", with_filename, "", "\\\\server\\share");
|
|
|
|
t!(s: "\\\\server\\share\\foo", with_filename, "..", "\\\\server\\share");
|
|
|
|
t!(s: "\\\\server\\share", with_filename, "..", "\\\\server\\share");
|
|
|
|
t!(s: "\\\\?\\C:\\foo\\bar", with_filename, "baz", "\\\\?\\C:\\foo\\baz");
|
|
|
|
t!(s: "\\\\?\\C:\\foo", with_filename, "bar", "\\\\?\\C:\\bar");
|
|
|
|
t!(s: "\\\\?\\C:\\", with_filename, "foo", "\\\\?\\C:\\foo");
|
|
|
|
t!(s: "\\\\?\\C:\\foo", with_filename, "..", "\\\\?\\C:\\..");
|
|
|
|
t!(s: "\\\\?\\foo\\bar", with_filename, "baz", "\\\\?\\foo\\baz");
|
|
|
|
t!(s: "\\\\?\\foo", with_filename, "bar", "\\\\?\\foo\\bar");
|
|
|
|
t!(s: "\\\\?\\", with_filename, "foo", "\\\\?\\\\foo");
|
|
|
|
t!(s: "\\\\?\\foo\\bar", with_filename, "..", "\\\\?\\foo\\..");
|
|
|
|
t!(s: "\\\\.\\foo\\bar", with_filename, "baz", "\\\\.\\foo\\baz");
|
|
|
|
t!(s: "\\\\.\\foo", with_filename, "bar", "\\\\.\\foo\\bar");
|
|
|
|
t!(s: "\\\\.\\foo\\bar", with_filename, "..", "\\\\.\\foo\\..");
|
|
|
|
|
|
|
|
t!(s: "hi\\there.txt", with_extension, "exe", "hi\\there.exe");
|
|
|
|
t!(s: "hi\\there.txt", with_extension, "", "hi\\there");
|
|
|
|
t!(s: "hi\\there.txt", with_extension, ".", "hi\\there..");
|
|
|
|
t!(s: "hi\\there.txt", with_extension, "..", "hi\\there...");
|
|
|
|
t!(s: "hi\\there", with_extension, "txt", "hi\\there.txt");
|
|
|
|
t!(s: "hi\\there", with_extension, ".", "hi\\there..");
|
|
|
|
t!(s: "hi\\there", with_extension, "..", "hi\\there...");
|
|
|
|
t!(s: "hi\\there.", with_extension, "txt", "hi\\there.txt");
|
|
|
|
t!(s: "hi\\.foo", with_extension, "txt", "hi\\.foo.txt");
|
|
|
|
t!(s: "hi\\there.txt", with_extension, ".foo", "hi\\there..foo");
|
|
|
|
t!(s: "\\", with_extension, "txt", "\\");
|
|
|
|
t!(s: "\\", with_extension, ".", "\\");
|
|
|
|
t!(s: "\\", with_extension, "..", "\\");
|
|
|
|
t!(s: ".", with_extension, "txt", ".");
|
2013-08-27 00:51:08 -07:00
|
|
|
// extension setter calls filename setter internally, no need for extended tests
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_setters() {
|
|
|
|
macro_rules! t(
|
|
|
|
(s: $path:expr, $set:ident, $with:ident, $arg:expr) => (
|
|
|
|
{
|
|
|
|
let path = $path;
|
|
|
|
let arg = $arg;
|
2013-12-03 19:15:12 -08:00
|
|
|
let mut p1 = Path::new(path);
|
2013-08-27 00:51:08 -07:00
|
|
|
p1.$set(arg);
|
2013-12-03 19:15:12 -08:00
|
|
|
let p2 = Path::new(path);
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(p1 == p2.$with(arg));
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
);
|
|
|
|
(v: $path:expr, $set:ident, $with:ident, $arg:expr) => (
|
|
|
|
{
|
|
|
|
let path = $path;
|
|
|
|
let arg = $arg;
|
2013-12-03 19:15:12 -08:00
|
|
|
let mut p1 = Path::new(path);
|
2013-08-27 00:51:08 -07:00
|
|
|
p1.$set(arg);
|
2013-12-03 19:15:12 -08:00
|
|
|
let p2 = Path::new(path);
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(p1 == p2.$with(arg));
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
t!(v: b!("a\\b\\c"), set_filename, with_filename, b!("d"));
|
|
|
|
t!(v: b!("\\"), set_filename, with_filename, b!("foo"));
|
2013-10-05 19:49:32 -07:00
|
|
|
t!(s: "a\\b\\c", set_filename, with_filename, "d");
|
|
|
|
t!(s: "\\", set_filename, with_filename, "foo");
|
|
|
|
t!(s: ".", set_filename, with_filename, "foo");
|
|
|
|
t!(s: "a\\b", set_filename, with_filename, "");
|
|
|
|
t!(s: "a", set_filename, with_filename, "");
|
2013-08-27 00:51:08 -07:00
|
|
|
|
|
|
|
t!(v: b!("hi\\there.txt"), set_extension, with_extension, b!("exe"));
|
2013-10-05 19:49:32 -07:00
|
|
|
t!(s: "hi\\there.txt", set_extension, with_extension, "exe");
|
|
|
|
t!(s: "hi\\there.", set_extension, with_extension, "txt");
|
|
|
|
t!(s: "hi\\there", set_extension, with_extension, "txt");
|
|
|
|
t!(s: "hi\\there.txt", set_extension, with_extension, "");
|
|
|
|
t!(s: "hi\\there", set_extension, with_extension, "");
|
|
|
|
t!(s: ".", set_extension, with_extension, "txt");
|
2013-08-27 00:51:08 -07:00
|
|
|
|
|
|
|
// with_ helpers use the setter internally, so the tests for the with_ helpers
|
|
|
|
// will suffice. No need for the full set of prefix tests.
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_getters() {
|
|
|
|
macro_rules! t(
|
|
|
|
(s: $path:expr, $filename:expr, $dirname:expr, $filestem:expr, $ext:expr) => (
|
|
|
|
{
|
|
|
|
let path = $path;
|
2013-09-26 17:21:59 -07:00
|
|
|
let filename = $filename;
|
|
|
|
assert!(path.filename_str() == filename,
|
2013-10-01 23:41:59 -07:00
|
|
|
"`{}`.filename_str(): Expected `{:?}`, found `{:?}`",
|
2013-09-26 17:21:59 -07:00
|
|
|
path.as_str().unwrap(), filename, path.filename_str());
|
|
|
|
let dirname = $dirname;
|
|
|
|
assert!(path.dirname_str() == dirname,
|
2013-10-01 23:41:59 -07:00
|
|
|
"`{}`.dirname_str(): Expected `{:?}`, found `{:?}`",
|
2013-09-26 17:21:59 -07:00
|
|
|
path.as_str().unwrap(), dirname, path.dirname_str());
|
|
|
|
let filestem = $filestem;
|
|
|
|
assert!(path.filestem_str() == filestem,
|
2013-10-01 23:41:59 -07:00
|
|
|
"`{}`.filestem_str(): Expected `{:?}`, found `{:?}`",
|
2013-09-26 17:21:59 -07:00
|
|
|
path.as_str().unwrap(), filestem, path.filestem_str());
|
|
|
|
let ext = $ext;
|
|
|
|
assert!(path.extension_str() == ext,
|
2013-10-01 23:41:59 -07:00
|
|
|
"`{}`.extension_str(): Expected `{:?}`, found `{:?}`",
|
2013-09-26 17:21:59 -07:00
|
|
|
path.as_str().unwrap(), ext, path.extension_str());
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
);
|
|
|
|
(v: $path:expr, $filename:expr, $dirname:expr, $filestem:expr, $ext:expr) => (
|
|
|
|
{
|
|
|
|
let path = $path;
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(path.filename() == $filename);
|
|
|
|
assert!(path.dirname() == $dirname);
|
|
|
|
assert!(path.filestem() == $filestem);
|
|
|
|
assert!(path.extension() == $ext);
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
2013-12-03 19:15:12 -08:00
|
|
|
t!(v: Path::new(b!("a\\b\\c")), Some(b!("c")), b!("a\\b"), Some(b!("c")), None);
|
|
|
|
t!(s: Path::new("a\\b\\c"), Some("c"), Some("a\\b"), Some("c"), None);
|
|
|
|
t!(s: Path::new("."), None, Some("."), None, None);
|
|
|
|
t!(s: Path::new("\\"), None, Some("\\"), None, None);
|
|
|
|
t!(s: Path::new(".."), None, Some(".."), None, None);
|
|
|
|
t!(s: Path::new("..\\.."), None, Some("..\\.."), None, None);
|
|
|
|
t!(s: Path::new("hi\\there.txt"), Some("there.txt"), Some("hi"),
|
2013-08-27 00:51:08 -07:00
|
|
|
Some("there"), Some("txt"));
|
2013-12-03 19:15:12 -08:00
|
|
|
t!(s: Path::new("hi\\there"), Some("there"), Some("hi"), Some("there"), None);
|
|
|
|
t!(s: Path::new("hi\\there."), Some("there."), Some("hi"),
|
2013-08-27 00:51:08 -07:00
|
|
|
Some("there"), Some(""));
|
2013-12-03 19:15:12 -08:00
|
|
|
t!(s: Path::new("hi\\.there"), Some(".there"), Some("hi"), Some(".there"), None);
|
|
|
|
t!(s: Path::new("hi\\..there"), Some("..there"), Some("hi"),
|
2013-08-27 00:51:08 -07:00
|
|
|
Some("."), Some("there"));
|
|
|
|
|
|
|
|
// these are already tested in test_components, so no need for extended tests
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2013-10-09 22:05:14 -07:00
|
|
|
fn test_dir_path() {
|
2013-12-03 19:15:12 -08:00
|
|
|
t!(s: Path::new("hi\\there").dir_path(), "hi");
|
|
|
|
t!(s: Path::new("hi").dir_path(), ".");
|
|
|
|
t!(s: Path::new("\\hi").dir_path(), "\\");
|
|
|
|
t!(s: Path::new("\\").dir_path(), "\\");
|
|
|
|
t!(s: Path::new("..").dir_path(), "..");
|
|
|
|
t!(s: Path::new("..\\..").dir_path(), "..\\..");
|
2013-08-27 00:51:08 -07:00
|
|
|
|
2013-10-09 22:05:14 -07:00
|
|
|
// dir_path is just dirname interpreted as a path.
|
2013-08-27 00:51:08 -07:00
|
|
|
// No need for extended tests
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_is_absolute() {
|
|
|
|
macro_rules! t(
|
2013-09-26 17:21:59 -07:00
|
|
|
($path:expr, $abs:expr, $vol:expr, $cwd:expr, $rel:expr) => (
|
2013-08-27 00:51:08 -07:00
|
|
|
{
|
2013-12-03 19:15:12 -08:00
|
|
|
let path = Path::new($path);
|
2013-09-26 17:21:59 -07:00
|
|
|
let (abs, vol, cwd, rel) = ($abs, $vol, $cwd, $rel);
|
2013-08-27 00:51:08 -07:00
|
|
|
let b = path.is_absolute();
|
2013-10-01 23:41:59 -07:00
|
|
|
assert!(b == abs, "Path '{}'.is_absolute(): expected {:?}, found {:?}",
|
2013-08-27 00:51:08 -07:00
|
|
|
path.as_str().unwrap(), abs, b);
|
2013-10-07 19:16:58 -07:00
|
|
|
let b = is_vol_relative(&path);
|
|
|
|
assert!(b == vol, "is_vol_relative('{}'): expected {:?}, found {:?}",
|
2013-08-27 00:51:08 -07:00
|
|
|
path.as_str().unwrap(), vol, b);
|
2013-10-07 19:16:58 -07:00
|
|
|
let b = is_cwd_relative(&path);
|
|
|
|
assert!(b == cwd, "is_cwd_relative('{}'): expected {:?}, found {:?}",
|
2013-08-27 00:51:08 -07:00
|
|
|
path.as_str().unwrap(), cwd, b);
|
2013-09-26 17:21:59 -07:00
|
|
|
let b = path.is_relative();
|
2013-10-01 23:41:59 -07:00
|
|
|
assert!(b == rel, "Path '{}'.is_relativf(): expected {:?}, found {:?}",
|
2013-09-26 17:21:59 -07:00
|
|
|
path.as_str().unwrap(), rel, b);
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
2013-09-26 17:21:59 -07:00
|
|
|
t!("a\\b\\c", false, false, false, true);
|
|
|
|
t!("\\a\\b\\c", false, true, false, false);
|
|
|
|
t!("a", false, false, false, true);
|
|
|
|
t!("\\a", false, true, false, false);
|
|
|
|
t!(".", false, false, false, true);
|
|
|
|
t!("\\", false, true, false, false);
|
|
|
|
t!("..", false, false, false, true);
|
|
|
|
t!("..\\..", false, false, false, true);
|
|
|
|
t!("C:a\\b.txt", false, false, true, false);
|
|
|
|
t!("C:\\a\\b.txt", true, false, false, false);
|
|
|
|
t!("\\\\server\\share\\a\\b.txt", true, false, false, false);
|
|
|
|
t!("\\\\?\\a\\b\\c.txt", true, false, false, false);
|
|
|
|
t!("\\\\?\\C:\\a\\b.txt", true, false, false, false);
|
|
|
|
t!("\\\\?\\C:a\\b.txt", true, false, false, false); // NB: not equivalent to C:a\b.txt
|
|
|
|
t!("\\\\?\\UNC\\server\\share\\a\\b.txt", true, false, false, false);
|
|
|
|
t!("\\\\.\\a\\b", true, false, false, false);
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_is_ancestor_of() {
|
|
|
|
macro_rules! t(
|
|
|
|
(s: $path:expr, $dest:expr, $exp:expr) => (
|
|
|
|
{
|
2013-12-03 19:15:12 -08:00
|
|
|
let path = Path::new($path);
|
|
|
|
let dest = Path::new($dest);
|
2013-08-27 00:51:08 -07:00
|
|
|
let exp = $exp;
|
|
|
|
let res = path.is_ancestor_of(&dest);
|
|
|
|
assert!(res == exp,
|
2013-10-01 23:41:59 -07:00
|
|
|
"`{}`.is_ancestor_of(`{}`): Expected {:?}, found {:?}",
|
2013-08-27 00:51:08 -07:00
|
|
|
path.as_str().unwrap(), dest.as_str().unwrap(), exp, res);
|
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
t!(s: "a\\b\\c", "a\\b\\c\\d", true);
|
|
|
|
t!(s: "a\\b\\c", "a\\b\\c", true);
|
|
|
|
t!(s: "a\\b\\c", "a\\b", false);
|
|
|
|
t!(s: "\\a\\b\\c", "\\a\\b\\c", true);
|
|
|
|
t!(s: "\\a\\b", "\\a\\b\\c", true);
|
|
|
|
t!(s: "\\a\\b\\c\\d", "\\a\\b\\c", false);
|
|
|
|
t!(s: "\\a\\b", "a\\b\\c", false);
|
|
|
|
t!(s: "a\\b", "\\a\\b\\c", false);
|
|
|
|
t!(s: "a\\b\\c", "a\\b\\d", false);
|
|
|
|
t!(s: "..\\a\\b\\c", "a\\b\\c", false);
|
|
|
|
t!(s: "a\\b\\c", "..\\a\\b\\c", false);
|
|
|
|
t!(s: "a\\b\\c", "a\\b\\cd", false);
|
|
|
|
t!(s: "a\\b\\cd", "a\\b\\c", false);
|
|
|
|
t!(s: "..\\a\\b", "..\\a\\b\\c", true);
|
|
|
|
t!(s: ".", "a\\b", true);
|
|
|
|
t!(s: ".", ".", true);
|
|
|
|
t!(s: "\\", "\\", true);
|
|
|
|
t!(s: "\\", "\\a\\b", true);
|
|
|
|
t!(s: "..", "a\\b", true);
|
|
|
|
t!(s: "..\\..", "a\\b", true);
|
|
|
|
t!(s: "foo\\bar", "foobar", false);
|
|
|
|
t!(s: "foobar", "foo\\bar", false);
|
|
|
|
|
|
|
|
t!(s: "foo", "C:foo", false);
|
|
|
|
t!(s: "C:foo", "foo", false);
|
|
|
|
t!(s: "C:foo", "C:foo\\bar", true);
|
|
|
|
t!(s: "C:foo\\bar", "C:foo", false);
|
|
|
|
t!(s: "C:\\foo", "C:\\foo\\bar", true);
|
|
|
|
t!(s: "C:", "C:", true);
|
|
|
|
t!(s: "C:", "C:\\", false);
|
|
|
|
t!(s: "C:\\", "C:", false);
|
|
|
|
t!(s: "C:\\", "C:\\", true);
|
|
|
|
t!(s: "C:\\foo\\bar", "C:\\foo", false);
|
|
|
|
t!(s: "C:foo\\bar", "C:foo", false);
|
|
|
|
t!(s: "C:\\foo", "\\foo", false);
|
|
|
|
t!(s: "\\foo", "C:\\foo", false);
|
|
|
|
t!(s: "\\\\server\\share\\foo", "\\\\server\\share\\foo\\bar", true);
|
|
|
|
t!(s: "\\\\server\\share", "\\\\server\\share\\foo", true);
|
|
|
|
t!(s: "\\\\server\\share\\foo", "\\\\server\\share", false);
|
|
|
|
t!(s: "C:\\foo", "\\\\server\\share\\foo", false);
|
|
|
|
t!(s: "\\\\server\\share\\foo", "C:\\foo", false);
|
|
|
|
t!(s: "\\\\?\\foo\\bar", "\\\\?\\foo\\bar\\baz", true);
|
|
|
|
t!(s: "\\\\?\\foo\\bar\\baz", "\\\\?\\foo\\bar", false);
|
|
|
|
t!(s: "\\\\?\\foo\\bar", "\\foo\\bar\\baz", false);
|
|
|
|
t!(s: "\\foo\\bar", "\\\\?\\foo\\bar\\baz", false);
|
|
|
|
t!(s: "\\\\?\\C:\\foo\\bar", "\\\\?\\C:\\foo\\bar\\baz", true);
|
|
|
|
t!(s: "\\\\?\\C:\\foo\\bar\\baz", "\\\\?\\C:\\foo\\bar", false);
|
|
|
|
t!(s: "\\\\?\\C:\\", "\\\\?\\C:\\foo", true);
|
|
|
|
t!(s: "\\\\?\\C:", "\\\\?\\C:\\", false); // this is a weird one
|
|
|
|
t!(s: "\\\\?\\C:\\", "\\\\?\\C:", false);
|
|
|
|
t!(s: "\\\\?\\C:\\a", "\\\\?\\c:\\a\\b", true);
|
|
|
|
t!(s: "\\\\?\\c:\\a", "\\\\?\\C:\\a\\b", true);
|
|
|
|
t!(s: "\\\\?\\C:\\a", "\\\\?\\D:\\a\\b", false);
|
|
|
|
t!(s: "\\\\?\\foo", "\\\\?\\foobar", false);
|
|
|
|
t!(s: "\\\\?\\a\\b", "\\\\?\\a\\b\\c", true);
|
|
|
|
t!(s: "\\\\?\\a\\b", "\\\\?\\a\\b\\", true);
|
|
|
|
t!(s: "\\\\?\\a\\b\\", "\\\\?\\a\\b", true);
|
|
|
|
t!(s: "\\\\?\\a\\b\\c", "\\\\?\\a\\b", false);
|
|
|
|
t!(s: "\\\\?\\a\\b\\c", "\\\\?\\a\\b\\", false);
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b\\c", "\\\\?\\UNC\\a\\b\\c\\d", true);
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b\\c\\d", "\\\\?\\UNC\\a\\b\\c", false);
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b", "\\\\?\\UNC\\a\\b\\c", true);
|
|
|
|
t!(s: "\\\\.\\foo\\bar", "\\\\.\\foo\\bar\\baz", true);
|
|
|
|
t!(s: "\\\\.\\foo\\bar\\baz", "\\\\.\\foo\\bar", false);
|
|
|
|
t!(s: "\\\\.\\foo", "\\\\.\\foo\\bar", true);
|
|
|
|
t!(s: "\\\\.\\foo", "\\\\.\\foobar", false);
|
|
|
|
|
|
|
|
t!(s: "\\a\\b", "\\\\?\\a\\b", false);
|
|
|
|
t!(s: "\\\\?\\a\\b", "\\a\\b", false);
|
|
|
|
t!(s: "\\a\\b", "\\\\?\\C:\\a\\b", false);
|
|
|
|
t!(s: "\\\\?\\C:\\a\\b", "\\a\\b", false);
|
|
|
|
t!(s: "Z:\\a\\b", "\\\\?\\z:\\a\\b", true);
|
|
|
|
t!(s: "C:\\a\\b", "\\\\?\\D:\\a\\b", false);
|
|
|
|
t!(s: "a\\b", "\\\\?\\a\\b", false);
|
|
|
|
t!(s: "\\\\?\\a\\b", "a\\b", false);
|
|
|
|
t!(s: "C:\\a\\b", "\\\\?\\C:\\a\\b", true);
|
|
|
|
t!(s: "\\\\?\\C:\\a\\b", "C:\\a\\b", true);
|
|
|
|
t!(s: "C:a\\b", "\\\\?\\C:\\a\\b", false);
|
|
|
|
t!(s: "C:a\\b", "\\\\?\\C:a\\b", false);
|
|
|
|
t!(s: "\\\\?\\C:\\a\\b", "C:a\\b", false);
|
|
|
|
t!(s: "\\\\?\\C:a\\b", "C:a\\b", false);
|
|
|
|
t!(s: "C:\\a\\b", "\\\\?\\C:\\a\\b\\", true);
|
|
|
|
t!(s: "\\\\?\\C:\\a\\b\\", "C:\\a\\b", true);
|
|
|
|
t!(s: "\\\\a\\b\\c", "\\\\?\\UNC\\a\\b\\c", true);
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b\\c", "\\\\a\\b\\c", true);
|
|
|
|
}
|
|
|
|
|
2013-09-26 17:21:59 -07:00
|
|
|
#[test]
|
|
|
|
fn test_ends_with_path() {
|
|
|
|
macro_rules! t(
|
|
|
|
(s: $path:expr, $child:expr, $exp:expr) => (
|
|
|
|
{
|
2013-12-03 19:15:12 -08:00
|
|
|
let path = Path::new($path);
|
|
|
|
let child = Path::new($child);
|
2013-09-26 17:21:59 -07:00
|
|
|
assert_eq!(path.ends_with_path(&child), $exp);
|
|
|
|
}
|
|
|
|
);
|
|
|
|
)
|
|
|
|
|
|
|
|
t!(s: "a\\b\\c", "c", true);
|
|
|
|
t!(s: "a\\b\\c", "d", false);
|
|
|
|
t!(s: "foo\\bar\\quux", "bar", false);
|
|
|
|
t!(s: "foo\\bar\\quux", "barquux", false);
|
|
|
|
t!(s: "a\\b\\c", "b\\c", true);
|
|
|
|
t!(s: "a\\b\\c", "a\\b\\c", true);
|
|
|
|
t!(s: "a\\b\\c", "foo\\a\\b\\c", false);
|
|
|
|
t!(s: "\\a\\b\\c", "a\\b\\c", true);
|
|
|
|
t!(s: "\\a\\b\\c", "\\a\\b\\c", false); // child must be relative
|
|
|
|
t!(s: "\\a\\b\\c", "foo\\a\\b\\c", false);
|
|
|
|
t!(s: "a\\b\\c", "", false);
|
|
|
|
t!(s: "", "", true);
|
|
|
|
t!(s: "\\a\\b\\c", "d\\e\\f", false);
|
|
|
|
t!(s: "a\\b\\c", "a\\b", false);
|
|
|
|
t!(s: "a\\b\\c", "b", false);
|
|
|
|
t!(s: "C:\\a\\b", "b", true);
|
|
|
|
t!(s: "C:\\a\\b", "C:b", false);
|
|
|
|
t!(s: "C:\\a\\b", "C:a\\b", false);
|
|
|
|
}
|
|
|
|
|
2013-08-27 00:51:08 -07:00
|
|
|
#[test]
|
|
|
|
fn test_path_relative_from() {
|
|
|
|
macro_rules! t(
|
|
|
|
(s: $path:expr, $other:expr, $exp:expr) => (
|
|
|
|
{
|
2013-12-03 19:15:12 -08:00
|
|
|
let path = Path::new($path);
|
|
|
|
let other = Path::new($other);
|
2013-08-27 00:51:08 -07:00
|
|
|
let res = path.path_relative_from(&other);
|
|
|
|
let exp = $exp;
|
2013-10-15 23:32:14 -07:00
|
|
|
assert!(res.as_ref().and_then(|x| x.as_str()) == exp,
|
2013-10-01 23:41:59 -07:00
|
|
|
"`{}`.path_relative_from(`{}`): Expected {:?}, got {:?}",
|
2013-08-27 00:51:08 -07:00
|
|
|
path.as_str().unwrap(), other.as_str().unwrap(), exp,
|
2013-10-15 23:32:14 -07:00
|
|
|
res.as_ref().and_then(|x| x.as_str()));
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
t!(s: "a\\b\\c", "a\\b", Some("c"));
|
|
|
|
t!(s: "a\\b\\c", "a\\b\\d", Some("..\\c"));
|
|
|
|
t!(s: "a\\b\\c", "a\\b\\c\\d", Some(".."));
|
|
|
|
t!(s: "a\\b\\c", "a\\b\\c", Some("."));
|
|
|
|
t!(s: "a\\b\\c", "a\\b\\c\\d\\e", Some("..\\.."));
|
|
|
|
t!(s: "a\\b\\c", "a\\d\\e", Some("..\\..\\b\\c"));
|
|
|
|
t!(s: "a\\b\\c", "d\\e\\f", Some("..\\..\\..\\a\\b\\c"));
|
|
|
|
t!(s: "a\\b\\c", "\\a\\b\\c", None);
|
|
|
|
t!(s: "\\a\\b\\c", "a\\b\\c", Some("\\a\\b\\c"));
|
|
|
|
t!(s: "\\a\\b\\c", "\\a\\b\\c\\d", Some(".."));
|
|
|
|
t!(s: "\\a\\b\\c", "\\a\\b", Some("c"));
|
|
|
|
t!(s: "\\a\\b\\c", "\\a\\b\\c\\d\\e", Some("..\\.."));
|
|
|
|
t!(s: "\\a\\b\\c", "\\a\\d\\e", Some("..\\..\\b\\c"));
|
|
|
|
t!(s: "\\a\\b\\c", "\\d\\e\\f", Some("..\\..\\..\\a\\b\\c"));
|
|
|
|
t!(s: "hi\\there.txt", "hi\\there", Some("..\\there.txt"));
|
|
|
|
t!(s: ".", "a", Some(".."));
|
|
|
|
t!(s: ".", "a\\b", Some("..\\.."));
|
|
|
|
t!(s: ".", ".", Some("."));
|
|
|
|
t!(s: "a", ".", Some("a"));
|
|
|
|
t!(s: "a\\b", ".", Some("a\\b"));
|
|
|
|
t!(s: "..", ".", Some(".."));
|
|
|
|
t!(s: "a\\b\\c", "a\\b\\c", Some("."));
|
|
|
|
t!(s: "\\a\\b\\c", "\\a\\b\\c", Some("."));
|
|
|
|
t!(s: "\\", "\\", Some("."));
|
|
|
|
t!(s: "\\", ".", Some("\\"));
|
|
|
|
t!(s: "..\\..\\a", "b", Some("..\\..\\..\\a"));
|
|
|
|
t!(s: "a", "..\\..\\b", None);
|
|
|
|
t!(s: "..\\..\\a", "..\\..\\b", Some("..\\a"));
|
|
|
|
t!(s: "..\\..\\a", "..\\..\\a\\b", Some(".."));
|
|
|
|
t!(s: "..\\..\\a\\b", "..\\..\\a", Some("b"));
|
|
|
|
|
|
|
|
t!(s: "C:a\\b\\c", "C:a\\b", Some("c"));
|
|
|
|
t!(s: "C:a\\b", "C:a\\b\\c", Some(".."));
|
|
|
|
t!(s: "C:" ,"C:a\\b", Some("..\\.."));
|
|
|
|
t!(s: "C:a\\b", "C:c\\d", Some("..\\..\\a\\b"));
|
|
|
|
t!(s: "C:a\\b", "D:c\\d", Some("C:a\\b"));
|
|
|
|
t!(s: "C:a\\b", "C:..\\c", None);
|
|
|
|
t!(s: "C:..\\a", "C:b\\c", Some("..\\..\\..\\a"));
|
|
|
|
t!(s: "C:\\a\\b\\c", "C:\\a\\b", Some("c"));
|
|
|
|
t!(s: "C:\\a\\b", "C:\\a\\b\\c", Some(".."));
|
|
|
|
t!(s: "C:\\", "C:\\a\\b", Some("..\\.."));
|
|
|
|
t!(s: "C:\\a\\b", "C:\\c\\d", Some("..\\..\\a\\b"));
|
|
|
|
t!(s: "C:\\a\\b", "C:a\\b", Some("C:\\a\\b"));
|
|
|
|
t!(s: "C:a\\b", "C:\\a\\b", None);
|
|
|
|
t!(s: "\\a\\b", "C:\\a\\b", None);
|
|
|
|
t!(s: "\\a\\b", "C:a\\b", None);
|
|
|
|
t!(s: "a\\b", "C:\\a\\b", None);
|
|
|
|
t!(s: "a\\b", "C:a\\b", None);
|
|
|
|
|
|
|
|
t!(s: "\\\\a\\b\\c", "\\\\a\\b", Some("c"));
|
|
|
|
t!(s: "\\\\a\\b", "\\\\a\\b\\c", Some(".."));
|
|
|
|
t!(s: "\\\\a\\b\\c\\e", "\\\\a\\b\\c\\d", Some("..\\e"));
|
|
|
|
t!(s: "\\\\a\\c\\d", "\\\\a\\b\\d", Some("\\\\a\\c\\d"));
|
|
|
|
t!(s: "\\\\b\\c\\d", "\\\\a\\c\\d", Some("\\\\b\\c\\d"));
|
|
|
|
t!(s: "\\\\a\\b\\c", "\\d\\e", Some("\\\\a\\b\\c"));
|
|
|
|
t!(s: "\\d\\e", "\\\\a\\b\\c", None);
|
|
|
|
t!(s: "d\\e", "\\\\a\\b\\c", None);
|
|
|
|
t!(s: "C:\\a\\b\\c", "\\\\a\\b\\c", Some("C:\\a\\b\\c"));
|
|
|
|
t!(s: "C:\\c", "\\\\a\\b\\c", Some("C:\\c"));
|
|
|
|
|
|
|
|
t!(s: "\\\\?\\a\\b", "\\a\\b", Some("\\\\?\\a\\b"));
|
|
|
|
t!(s: "\\\\?\\a\\b", "a\\b", Some("\\\\?\\a\\b"));
|
|
|
|
t!(s: "\\\\?\\a\\b", "\\b", Some("\\\\?\\a\\b"));
|
|
|
|
t!(s: "\\\\?\\a\\b", "b", Some("\\\\?\\a\\b"));
|
|
|
|
t!(s: "\\\\?\\a\\b", "\\\\?\\a\\b\\c", Some(".."));
|
|
|
|
t!(s: "\\\\?\\a\\b\\c", "\\\\?\\a\\b", Some("c"));
|
|
|
|
t!(s: "\\\\?\\a\\b", "\\\\?\\c\\d", Some("\\\\?\\a\\b"));
|
|
|
|
t!(s: "\\\\?\\a", "\\\\?\\b", Some("\\\\?\\a"));
|
|
|
|
|
|
|
|
t!(s: "\\\\?\\C:\\a\\b", "\\\\?\\C:\\a", Some("b"));
|
|
|
|
t!(s: "\\\\?\\C:\\a", "\\\\?\\C:\\a\\b", Some(".."));
|
|
|
|
t!(s: "\\\\?\\C:\\a", "\\\\?\\C:\\b", Some("..\\a"));
|
|
|
|
t!(s: "\\\\?\\C:\\a", "\\\\?\\D:\\a", Some("\\\\?\\C:\\a"));
|
|
|
|
t!(s: "\\\\?\\C:\\a\\b", "\\\\?\\c:\\a", Some("b"));
|
|
|
|
t!(s: "\\\\?\\C:\\a\\b", "C:\\a", Some("b"));
|
|
|
|
t!(s: "\\\\?\\C:\\a", "C:\\a\\b", Some(".."));
|
|
|
|
t!(s: "C:\\a\\b", "\\\\?\\C:\\a", Some("b"));
|
|
|
|
t!(s: "C:\\a", "\\\\?\\C:\\a\\b", Some(".."));
|
|
|
|
t!(s: "\\\\?\\C:\\a", "D:\\a", Some("\\\\?\\C:\\a"));
|
|
|
|
t!(s: "\\\\?\\c:\\a\\b", "C:\\a", Some("b"));
|
|
|
|
t!(s: "\\\\?\\C:\\a\\b", "C:a\\b", Some("\\\\?\\C:\\a\\b"));
|
|
|
|
t!(s: "\\\\?\\C:\\a\\.\\b", "C:\\a", Some("\\\\?\\C:\\a\\.\\b"));
|
|
|
|
t!(s: "\\\\?\\C:\\a\\b/c", "C:\\a", Some("\\\\?\\C:\\a\\b/c"));
|
|
|
|
t!(s: "\\\\?\\C:\\a\\..\\b", "C:\\a", Some("\\\\?\\C:\\a\\..\\b"));
|
|
|
|
t!(s: "C:a\\b", "\\\\?\\C:\\a\\b", None);
|
|
|
|
t!(s: "\\\\?\\C:\\a\\.\\b", "\\\\?\\C:\\a", Some("\\\\?\\C:\\a\\.\\b"));
|
|
|
|
t!(s: "\\\\?\\C:\\a\\b/c", "\\\\?\\C:\\a", Some("\\\\?\\C:\\a\\b/c"));
|
|
|
|
t!(s: "\\\\?\\C:\\a\\..\\b", "\\\\?\\C:\\a", Some("\\\\?\\C:\\a\\..\\b"));
|
|
|
|
t!(s: "\\\\?\\C:\\a\\b\\", "\\\\?\\C:\\a", Some("b"));
|
|
|
|
t!(s: "\\\\?\\C:\\.\\b", "\\\\?\\C:\\.", Some("b"));
|
|
|
|
t!(s: "C:\\b", "\\\\?\\C:\\.", Some("..\\b"));
|
|
|
|
t!(s: "\\\\?\\a\\.\\b\\c", "\\\\?\\a\\.\\b", Some("c"));
|
|
|
|
t!(s: "\\\\?\\a\\b\\c", "\\\\?\\a\\.\\d", Some("..\\..\\b\\c"));
|
|
|
|
t!(s: "\\\\?\\a\\..\\b", "\\\\?\\a\\..", Some("b"));
|
|
|
|
t!(s: "\\\\?\\a\\b\\..", "\\\\?\\a\\b", Some("\\\\?\\a\\b\\.."));
|
|
|
|
t!(s: "\\\\?\\a\\b\\c", "\\\\?\\a\\..\\b", Some("..\\..\\b\\c"));
|
|
|
|
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b\\c", "\\\\?\\UNC\\a\\b", Some("c"));
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b", "\\\\?\\UNC\\a\\b\\c", Some(".."));
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b\\c", "\\\\?\\UNC\\a\\c\\d", Some("\\\\?\\UNC\\a\\b\\c"));
|
|
|
|
t!(s: "\\\\?\\UNC\\b\\c\\d", "\\\\?\\UNC\\a\\c\\d", Some("\\\\?\\UNC\\b\\c\\d"));
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b\\c", "\\\\?\\a\\b\\c", Some("\\\\?\\UNC\\a\\b\\c"));
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b\\c", "\\\\?\\C:\\a\\b\\c", Some("\\\\?\\UNC\\a\\b\\c"));
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b\\c/d", "\\\\?\\UNC\\a\\b", Some("\\\\?\\UNC\\a\\b\\c/d"));
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b\\.", "\\\\?\\UNC\\a\\b", Some("\\\\?\\UNC\\a\\b\\."));
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b\\..", "\\\\?\\UNC\\a\\b", Some("\\\\?\\UNC\\a\\b\\.."));
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b\\c", "\\\\a\\b", Some("c"));
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b", "\\\\a\\b\\c", Some(".."));
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b\\c", "\\\\a\\c\\d", Some("\\\\?\\UNC\\a\\b\\c"));
|
|
|
|
t!(s: "\\\\?\\UNC\\b\\c\\d", "\\\\a\\c\\d", Some("\\\\?\\UNC\\b\\c\\d"));
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b\\.", "\\\\a\\b", Some("\\\\?\\UNC\\a\\b\\."));
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b\\c/d", "\\\\a\\b", Some("\\\\?\\UNC\\a\\b\\c/d"));
|
|
|
|
t!(s: "\\\\?\\UNC\\a\\b\\..", "\\\\a\\b", Some("\\\\?\\UNC\\a\\b\\.."));
|
|
|
|
t!(s: "\\\\a\\b\\c", "\\\\?\\UNC\\a\\b", Some("c"));
|
|
|
|
t!(s: "\\\\a\\b\\c", "\\\\?\\UNC\\a\\c\\d", Some("\\\\a\\b\\c"));
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
2013-11-23 11:18:51 +01:00
|
|
|
fn test_str_components() {
|
2013-08-27 00:51:08 -07:00
|
|
|
macro_rules! t(
|
|
|
|
(s: $path:expr, $exp:expr) => (
|
|
|
|
{
|
2013-12-03 19:15:12 -08:00
|
|
|
let path = Path::new($path);
|
2014-03-22 19:18:37 -04:00
|
|
|
let comps = path.str_components().map(|x|x.unwrap())
|
2014-04-12 20:56:23 +10:00
|
|
|
.collect::<Vec<&str>>();
|
2013-08-27 00:51:08 -07:00
|
|
|
let exp: &[&str] = $exp;
|
2014-04-12 20:56:23 +10:00
|
|
|
assert_eq!(comps.as_slice(), exp);
|
Deprecate the rev_iter pattern in all places where a DoubleEndedIterator is provided (everywhere but treemap)
This commit deprecates rev_iter, mut_rev_iter, move_rev_iter everywhere (except treemap) and also
deprecates related functions like rsplit, rev_components, and rev_str_components. In every case,
these functions can be replaced with the non-reversed form followed by a call to .rev(). To make this
more concrete, a translation table for all functional changes necessary follows:
* container.rev_iter() -> container.iter().rev()
* container.mut_rev_iter() -> container.mut_iter().rev()
* container.move_rev_iter() -> container.move_iter().rev()
* sliceorstr.rsplit(sep) -> sliceorstr.split(sep).rev()
* path.rev_components() -> path.components().rev()
* path.rev_str_components() -> path.str_components().rev()
In terms of the type system, this change also deprecates any specialized reversed iterator types (except
in treemap), opting instead to use Rev directly if any type annotations are needed. However, since
methods directly returning reversed iterators are now discouraged, the need for such annotations should
be small. However, in those cases, the general pattern for conversion is to take whatever follows Rev in
the original reversed name and surround it with Rev<>:
* RevComponents<'a> -> Rev<Components<'a>>
* RevStrComponents<'a> -> Rev<StrComponents<'a>>
* RevItems<'a, T> -> Rev<Items<'a, T>>
* etc.
The reasoning behind this change is that it makes the standard API much simpler without reducing readability,
performance, or power. The presence of functions such as rev_iter adds more boilerplate code to libraries
(all of which simply call .iter().rev()), clutters up the documentation, and only helps code by saving two
characters. Additionally, the numerous type synonyms that were used to make the type signatures look nice
like RevItems add even more boilerplate and clutter up the docs even more. With this change, all that cruft
goes away.
[breaking-change]
2014-04-20 23:59:12 -05:00
|
|
|
let comps = path.str_components().rev().map(|x|x.unwrap())
|
2014-04-12 20:56:23 +10:00
|
|
|
.collect::<Vec<&str>>();
|
Deprecate the rev_iter pattern in all places where a DoubleEndedIterator is provided (everywhere but treemap)
This commit deprecates rev_iter, mut_rev_iter, move_rev_iter everywhere (except treemap) and also
deprecates related functions like rsplit, rev_components, and rev_str_components. In every case,
these functions can be replaced with the non-reversed form followed by a call to .rev(). To make this
more concrete, a translation table for all functional changes necessary follows:
* container.rev_iter() -> container.iter().rev()
* container.mut_rev_iter() -> container.mut_iter().rev()
* container.move_rev_iter() -> container.move_iter().rev()
* sliceorstr.rsplit(sep) -> sliceorstr.split(sep).rev()
* path.rev_components() -> path.components().rev()
* path.rev_str_components() -> path.str_components().rev()
In terms of the type system, this change also deprecates any specialized reversed iterator types (except
in treemap), opting instead to use Rev directly if any type annotations are needed. However, since
methods directly returning reversed iterators are now discouraged, the need for such annotations should
be small. However, in those cases, the general pattern for conversion is to take whatever follows Rev in
the original reversed name and surround it with Rev<>:
* RevComponents<'a> -> Rev<Components<'a>>
* RevStrComponents<'a> -> Rev<StrComponents<'a>>
* RevItems<'a, T> -> Rev<Items<'a, T>>
* etc.
The reasoning behind this change is that it makes the standard API much simpler without reducing readability,
performance, or power. The presence of functions such as rev_iter adds more boilerplate code to libraries
(all of which simply call .iter().rev()), clutters up the documentation, and only helps code by saving two
characters. Additionally, the numerous type synonyms that were used to make the type signatures look nice
like RevItems add even more boilerplate and clutter up the docs even more. With this change, all that cruft
goes away.
[breaking-change]
2014-04-20 23:59:12 -05:00
|
|
|
let exp = exp.iter().rev().map(|&x|x).collect::<Vec<&str>>();
|
2014-04-12 20:56:23 +10:00
|
|
|
assert_eq!(comps, exp);
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
);
|
|
|
|
(v: [$($arg:expr),+], $exp:expr) => (
|
|
|
|
{
|
2013-12-03 19:15:12 -08:00
|
|
|
let path = Path::new(b!($($arg),+));
|
2014-04-12 20:56:23 +10:00
|
|
|
let comps = path.str_components().map(|x|x.unwrap()).collect::<Vec<&str>>();
|
2013-08-27 00:51:08 -07:00
|
|
|
let exp: &[&str] = $exp;
|
2014-04-12 20:56:23 +10:00
|
|
|
assert_eq!(comps.as_slice(), exp);
|
Deprecate the rev_iter pattern in all places where a DoubleEndedIterator is provided (everywhere but treemap)
This commit deprecates rev_iter, mut_rev_iter, move_rev_iter everywhere (except treemap) and also
deprecates related functions like rsplit, rev_components, and rev_str_components. In every case,
these functions can be replaced with the non-reversed form followed by a call to .rev(). To make this
more concrete, a translation table for all functional changes necessary follows:
* container.rev_iter() -> container.iter().rev()
* container.mut_rev_iter() -> container.mut_iter().rev()
* container.move_rev_iter() -> container.move_iter().rev()
* sliceorstr.rsplit(sep) -> sliceorstr.split(sep).rev()
* path.rev_components() -> path.components().rev()
* path.rev_str_components() -> path.str_components().rev()
In terms of the type system, this change also deprecates any specialized reversed iterator types (except
in treemap), opting instead to use Rev directly if any type annotations are needed. However, since
methods directly returning reversed iterators are now discouraged, the need for such annotations should
be small. However, in those cases, the general pattern for conversion is to take whatever follows Rev in
the original reversed name and surround it with Rev<>:
* RevComponents<'a> -> Rev<Components<'a>>
* RevStrComponents<'a> -> Rev<StrComponents<'a>>
* RevItems<'a, T> -> Rev<Items<'a, T>>
* etc.
The reasoning behind this change is that it makes the standard API much simpler without reducing readability,
performance, or power. The presence of functions such as rev_iter adds more boilerplate code to libraries
(all of which simply call .iter().rev()), clutters up the documentation, and only helps code by saving two
characters. Additionally, the numerous type synonyms that were used to make the type signatures look nice
like RevItems add even more boilerplate and clutter up the docs even more. With this change, all that cruft
goes away.
[breaking-change]
2014-04-20 23:59:12 -05:00
|
|
|
let comps = path.str_components().rev().map(|x|x.unwrap())
|
2014-04-12 20:56:23 +10:00
|
|
|
.collect::<Vec<&str>>();
|
Deprecate the rev_iter pattern in all places where a DoubleEndedIterator is provided (everywhere but treemap)
This commit deprecates rev_iter, mut_rev_iter, move_rev_iter everywhere (except treemap) and also
deprecates related functions like rsplit, rev_components, and rev_str_components. In every case,
these functions can be replaced with the non-reversed form followed by a call to .rev(). To make this
more concrete, a translation table for all functional changes necessary follows:
* container.rev_iter() -> container.iter().rev()
* container.mut_rev_iter() -> container.mut_iter().rev()
* container.move_rev_iter() -> container.move_iter().rev()
* sliceorstr.rsplit(sep) -> sliceorstr.split(sep).rev()
* path.rev_components() -> path.components().rev()
* path.rev_str_components() -> path.str_components().rev()
In terms of the type system, this change also deprecates any specialized reversed iterator types (except
in treemap), opting instead to use Rev directly if any type annotations are needed. However, since
methods directly returning reversed iterators are now discouraged, the need for such annotations should
be small. However, in those cases, the general pattern for conversion is to take whatever follows Rev in
the original reversed name and surround it with Rev<>:
* RevComponents<'a> -> Rev<Components<'a>>
* RevStrComponents<'a> -> Rev<StrComponents<'a>>
* RevItems<'a, T> -> Rev<Items<'a, T>>
* etc.
The reasoning behind this change is that it makes the standard API much simpler without reducing readability,
performance, or power. The presence of functions such as rev_iter adds more boilerplate code to libraries
(all of which simply call .iter().rev()), clutters up the documentation, and only helps code by saving two
characters. Additionally, the numerous type synonyms that were used to make the type signatures look nice
like RevItems add even more boilerplate and clutter up the docs even more. With this change, all that cruft
goes away.
[breaking-change]
2014-04-20 23:59:12 -05:00
|
|
|
let exp = exp.iter().rev().map(|&x|x).collect::<Vec<&str>>();
|
2014-04-12 20:56:23 +10:00
|
|
|
assert_eq!(comps, exp);
|
2013-08-27 00:51:08 -07:00
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
t!(v: ["a\\b\\c"], ["a", "b", "c"]);
|
|
|
|
t!(s: "a\\b\\c", ["a", "b", "c"]);
|
|
|
|
t!(s: "a\\b\\d", ["a", "b", "d"]);
|
|
|
|
t!(s: "a\\b\\cd", ["a", "b", "cd"]);
|
|
|
|
t!(s: "\\a\\b\\c", ["a", "b", "c"]);
|
|
|
|
t!(s: "a", ["a"]);
|
|
|
|
t!(s: "\\a", ["a"]);
|
|
|
|
t!(s: "\\", []);
|
|
|
|
t!(s: ".", ["."]);
|
|
|
|
t!(s: "..", [".."]);
|
|
|
|
t!(s: "..\\..", ["..", ".."]);
|
|
|
|
t!(s: "..\\..\\foo", ["..", "..", "foo"]);
|
|
|
|
t!(s: "C:foo\\bar", ["foo", "bar"]);
|
|
|
|
t!(s: "C:foo", ["foo"]);
|
|
|
|
t!(s: "C:", []);
|
|
|
|
t!(s: "C:\\foo\\bar", ["foo", "bar"]);
|
|
|
|
t!(s: "C:\\foo", ["foo"]);
|
|
|
|
t!(s: "C:\\", []);
|
|
|
|
t!(s: "\\\\server\\share\\foo\\bar", ["foo", "bar"]);
|
|
|
|
t!(s: "\\\\server\\share\\foo", ["foo"]);
|
|
|
|
t!(s: "\\\\server\\share", []);
|
|
|
|
t!(s: "\\\\?\\foo\\bar\\baz", ["bar", "baz"]);
|
|
|
|
t!(s: "\\\\?\\foo\\bar", ["bar"]);
|
|
|
|
t!(s: "\\\\?\\foo", []);
|
|
|
|
t!(s: "\\\\?\\", []);
|
|
|
|
t!(s: "\\\\?\\a\\b", ["b"]);
|
|
|
|
t!(s: "\\\\?\\a\\b\\", ["b"]);
|
|
|
|
t!(s: "\\\\?\\foo\\bar\\\\baz", ["bar", "", "baz"]);
|
|
|
|
t!(s: "\\\\?\\C:\\foo\\bar", ["foo", "bar"]);
|
|
|
|
t!(s: "\\\\?\\C:\\foo", ["foo"]);
|
|
|
|
t!(s: "\\\\?\\C:\\", []);
|
|
|
|
t!(s: "\\\\?\\C:\\foo\\", ["foo"]);
|
|
|
|
t!(s: "\\\\?\\UNC\\server\\share\\foo\\bar", ["foo", "bar"]);
|
|
|
|
t!(s: "\\\\?\\UNC\\server\\share\\foo", ["foo"]);
|
|
|
|
t!(s: "\\\\?\\UNC\\server\\share", []);
|
|
|
|
t!(s: "\\\\.\\foo\\bar\\baz", ["bar", "baz"]);
|
|
|
|
t!(s: "\\\\.\\foo\\bar", ["bar"]);
|
|
|
|
t!(s: "\\\\.\\foo", []);
|
|
|
|
}
|
2013-09-26 14:38:26 -07:00
|
|
|
|
2013-09-26 17:21:59 -07:00
|
|
|
#[test]
|
2013-11-23 11:18:51 +01:00
|
|
|
fn test_components_iter() {
|
2013-09-26 17:21:59 -07:00
|
|
|
macro_rules! t(
|
|
|
|
(s: $path:expr, $exp:expr) => (
|
|
|
|
{
|
2013-12-03 19:15:12 -08:00
|
|
|
let path = Path::new($path);
|
2014-04-12 20:56:23 +10:00
|
|
|
let comps = path.components().collect::<Vec<&[u8]>>();
|
2013-09-26 17:21:59 -07:00
|
|
|
let exp: &[&[u8]] = $exp;
|
2014-04-12 20:56:23 +10:00
|
|
|
assert_eq!(comps.as_slice(), exp);
|
Deprecate the rev_iter pattern in all places where a DoubleEndedIterator is provided (everywhere but treemap)
This commit deprecates rev_iter, mut_rev_iter, move_rev_iter everywhere (except treemap) and also
deprecates related functions like rsplit, rev_components, and rev_str_components. In every case,
these functions can be replaced with the non-reversed form followed by a call to .rev(). To make this
more concrete, a translation table for all functional changes necessary follows:
* container.rev_iter() -> container.iter().rev()
* container.mut_rev_iter() -> container.mut_iter().rev()
* container.move_rev_iter() -> container.move_iter().rev()
* sliceorstr.rsplit(sep) -> sliceorstr.split(sep).rev()
* path.rev_components() -> path.components().rev()
* path.rev_str_components() -> path.str_components().rev()
In terms of the type system, this change also deprecates any specialized reversed iterator types (except
in treemap), opting instead to use Rev directly if any type annotations are needed. However, since
methods directly returning reversed iterators are now discouraged, the need for such annotations should
be small. However, in those cases, the general pattern for conversion is to take whatever follows Rev in
the original reversed name and surround it with Rev<>:
* RevComponents<'a> -> Rev<Components<'a>>
* RevStrComponents<'a> -> Rev<StrComponents<'a>>
* RevItems<'a, T> -> Rev<Items<'a, T>>
* etc.
The reasoning behind this change is that it makes the standard API much simpler without reducing readability,
performance, or power. The presence of functions such as rev_iter adds more boilerplate code to libraries
(all of which simply call .iter().rev()), clutters up the documentation, and only helps code by saving two
characters. Additionally, the numerous type synonyms that were used to make the type signatures look nice
like RevItems add even more boilerplate and clutter up the docs even more. With this change, all that cruft
goes away.
[breaking-change]
2014-04-20 23:59:12 -05:00
|
|
|
let comps = path.components().rev().collect::<Vec<&[u8]>>();
|
|
|
|
let exp = exp.iter().rev().map(|&x|x).collect::<Vec<&[u8]>>();
|
2014-04-12 20:56:23 +10:00
|
|
|
assert_eq!(comps, exp);
|
2013-09-26 17:21:59 -07:00
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
t!(s: "a\\b\\c", [b!("a"), b!("b"), b!("c")]);
|
|
|
|
t!(s: ".", [b!(".")]);
|
2013-11-23 11:18:51 +01:00
|
|
|
// since this is really a wrapper around str_components, those tests suffice
|
2013-09-26 17:21:59 -07:00
|
|
|
}
|
2014-02-27 00:25:43 -08:00
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_make_non_verbatim() {
|
|
|
|
macro_rules! t(
|
|
|
|
($path:expr, $exp:expr) => (
|
|
|
|
{
|
|
|
|
let path = Path::new($path);
|
|
|
|
let exp: Option<&str> = $exp;
|
|
|
|
let exp = exp.map(|s| Path::new(s));
|
2014-02-28 01:23:06 -08:00
|
|
|
assert!(make_non_verbatim(&path) == exp);
|
2014-02-27 00:25:43 -08:00
|
|
|
}
|
|
|
|
)
|
|
|
|
)
|
|
|
|
|
|
|
|
t!(r"\a\b\c", Some(r"\a\b\c"));
|
|
|
|
t!(r"a\b\c", Some(r"a\b\c"));
|
|
|
|
t!(r"C:\a\b\c", Some(r"C:\a\b\c"));
|
|
|
|
t!(r"C:a\b\c", Some(r"C:a\b\c"));
|
|
|
|
t!(r"\\server\share\foo", Some(r"\\server\share\foo"));
|
|
|
|
t!(r"\\.\foo", None);
|
|
|
|
t!(r"\\?\foo", None);
|
|
|
|
t!(r"\\?\C:", None);
|
|
|
|
t!(r"\\?\C:foo", None);
|
|
|
|
t!(r"\\?\C:\", Some(r"C:\"));
|
|
|
|
t!(r"\\?\C:\foo", Some(r"C:\foo"));
|
|
|
|
t!(r"\\?\C:\foo\bar\baz", Some(r"C:\foo\bar\baz"));
|
|
|
|
t!(r"\\?\C:\foo\.\bar\baz", None);
|
|
|
|
t!(r"\\?\C:\foo\bar\..\baz", None);
|
|
|
|
t!(r"\\?\C:\foo\bar\..", None);
|
|
|
|
t!(r"\\?\UNC\server\share\foo", Some(r"\\server\share\foo"));
|
|
|
|
t!(r"\\?\UNC\server\share", Some(r"\\server\share"));
|
|
|
|
t!(r"\\?\UNC\server", None);
|
|
|
|
t!(r"\\?\UNC\server\", None);
|
|
|
|
}
|
2013-09-01 12:44:07 -07:00
|
|
|
}
|