Skip to content

No longer treat \ as a path separator on posix systems. #8138

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed
wants to merge 1 commit into from
Closed

No longer treat \ as a path separator on posix systems. #8138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions src/libstd/path.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ impl GenericPath for PosixPath {
}

fn with_filename(&self, f: &str) -> PosixPath {
assert!(! f.iter().all(windows::is_sep));
assert!(!f.iter().all(posix::is_sep));
self.dir_path().push(f)
}

Expand Down Expand Up @@ -648,7 +648,7 @@ impl GenericPath for PosixPath {
fn push_many<S: Str>(&self, cs: &[S]) -> PosixPath {
let mut v = self.components.clone();
for cs.iter().advance |e| {
for e.as_slice().split_iter(windows::is_sep).advance |s| {
for e.as_slice().split_iter(posix::is_sep).advance |s| {
if !s.is_empty() {
v.push(s.to_owned())
}
Expand All @@ -662,7 +662,7 @@ impl GenericPath for PosixPath {

fn push(&self, s: &str) -> PosixPath {
let mut v = self.components.clone();
for s.split_iter(windows::is_sep).advance |s| {
for s.split_iter(posix::is_sep).advance |s| {
if !s.is_empty() {
v.push(s.to_owned())
}
Expand Down Expand Up @@ -1001,7 +1001,17 @@ pub fn normalize(components: &[~str]) -> ~[~str] {
cs
}

// Various windows helpers, and tests for the impl.
// Various posix helpers.
pub mod posix {

#[inline]
pub fn is_sep(u: char) -> bool {
u == '/'
}

}

// Various windows helpers.
pub mod windows {
use libc;
use option::{None, Option, Some};
Expand Down Expand Up @@ -1139,6 +1149,14 @@ mod tests {

}

#[test]
fn test_posix_push_with_backslash() {
let a = PosixPath("/aaa/bbb");
let b = a.push("x\\y"); // \ is not a file separator for posix paths
assert_eq!(a.components.len(), 2);
assert_eq!(b.components.len(), 3);
}

#[test]
fn test_normalize() {
fn t(wp: &PosixPath, s: &str) {
Expand Down