---

yaml
---
r: 83134
b: refs/heads/auto
c: ed539e1
h: refs/heads/master
v: v3

Author: lilyball

[refs]

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

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

@@ -43,6 +43,10 @@ Option<&str> with `.as_str()`. Similarly, attributes of the path can be queried
 with methods such as `.filename()`. There are also methods that return a new
 path instead of modifying the receiver, such as `.join()` or `.dir_path()`.
 
+Paths are always kept in normalized form. This means that creating the path
+`Path::from_str("a/b/../c")` will return the path `a/c`. Similarly any attempt
+to mutate the path will always leave it in normalized form.
+
 When rendering a path to some form of display, there is a method `.display()`
 which is compatible with the `format!()` parameter `{}`. This will render the
 path as a string, replacing all non-utf8 sequences with the Replacement

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

@@ -349,7 +349,7 @@ impl Path {
 
     /// Returns a normalized byte vector representation of a path, by removing all empty
     /// components, and unnecessary . and .. components.
-    pub fn normalize<V: Vector<u8>+CopyableVector<u8>>(v: V) -> ~[u8] {
+    fn normalize<V: Vector<u8>+CopyableVector<u8>>(v: V) -> ~[u8] {
         // borrowck is being very picky
         let val = {
             let is_abs = !v.as_slice().is_empty() && v.as_slice()[0] == sep;

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

@@ -697,13 +697,6 @@ impl Path {
         Some(self.repr)
     }
 
-    /// Returns a normalized string representation of a path, by removing all empty
-    /// components, and unnecessary . and .. components.
-    pub fn normalize<S: Str>(s: S) -> ~str {
-        let (_, path) = Path::normalize_(s);
-        path
-    }
-
     /// Returns an iterator that yields each component of the path in turn as a Option<&str>.
     /// Every component is guaranteed to be Some.
     /// Does not yield the path prefix (including server/share components in UNC paths).