---

yaml
---
r: 145935
b: refs/heads/try2
c: 6f5b809
h: refs/heads/master
i:
  145933: 423fb10
  145931: 0e14b50
  145927: 8c2a90e
  145919: bdfcab4
v: v3

Author: lilyball

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 6d29142219d92f886124057e9ecfdb51ffca19f2
+refs/heads/try2: 6f5b809775fb1f8dbf27edded8e955d64377749c
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/path2/posix.rs

@@ -97,13 +97,13 @@ impl GenericPathUnsafe for Path {
             Some(0) if self.repr.len() == 1 && self.repr[0] == sep => {
                 self.repr = Path::normalize(dirname);
             }
+            Some(idx) if self.repr.slice_from(idx+1) == bytes!("..") => {
+                self.repr = Path::normalize(dirname);
+            }
             Some(idx) if dirname.is_empty() => {
                 let v = Path::normalize(self.repr.slice_from(idx+1));
                 self.repr = v;
             }
-            Some(idx) if self.repr.slice_from(idx+1) == bytes!("..") => {
-                self.repr = Path::normalize(dirname);
-            }
             Some(idx) => {
                 let mut v = vec::with_capacity(dirname.len() + self.repr.len() - idx);
                 v.push_all(dirname);
@@ -444,7 +444,9 @@ mod tests {
         t!(s: Path::from_str(""), ".");
         t!(s: Path::from_str("/"), "/");
         t!(s: Path::from_str("hi"), "hi");
+        t!(s: Path::from_str("hi/"), "hi");
         t!(s: Path::from_str("/lib"), "/lib");
+        t!(s: Path::from_str("/lib/"), "/lib");
         t!(s: Path::from_str("hi/there"), "hi/there");
         t!(s: Path::from_str("hi/there.txt"), "hi/there.txt");
 
@@ -800,6 +802,8 @@ mod tests {
         t!(s: Path::from_str("/foo").with_dirname_str("bar"), "bar/foo");
         t!(s: Path::from_str("..").with_dirname_str("foo"), "foo");
         t!(s: Path::from_str("../..").with_dirname_str("foo"), "foo");
+        t!(s: Path::from_str("..").with_dirname_str(""), ".");
+        t!(s: Path::from_str("../..").with_dirname_str(""), ".");
         t!(s: Path::from_str("foo").with_dirname_str(".."), "../foo");
         t!(s: Path::from_str("foo").with_dirname_str("../.."), "../../foo");
 
@@ -813,6 +817,8 @@ mod tests {
         t!(s: Path::from_str("/").with_filename_str("foo"), "/foo");
         t!(s: Path::from_str("/a").with_filename_str("foo"), "/foo");
         t!(s: Path::from_str("foo").with_filename_str("bar"), "bar");
+        t!(s: Path::from_str("/").with_filename_str("foo/"), "/foo");
+        t!(s: Path::from_str("/a").with_filename_str("foo/"), "/foo");
         t!(s: Path::from_str("a/b/c").with_filename_str(""), "a/b");
         t!(s: Path::from_str("a/b/c").with_filename_str("."), "a/b");
         t!(s: Path::from_str("a/b/c").with_filename_str(".."), "a");
@@ -822,6 +828,8 @@ mod tests {
         t!(s: Path::from_str("a/b/c").with_filename_str("/d"), "a/b/d");
         t!(s: Path::from_str("..").with_filename_str("foo"), "../foo");
         t!(s: Path::from_str("../..").with_filename_str("foo"), "../../foo");
+        t!(s: Path::from_str("..").with_filename_str(""), "..");
+        t!(s: Path::from_str("../..").with_filename_str(""), "../..");
 
         t!(v: Path::new(b!("hi/there", 0x80, ".txt")).with_filestem(b!(0xff)),
               b!("hi/", 0xff, ".txt"));