---

yaml
---
r: 22547
b: refs/heads/master
c: b1dafe4
h: refs/heads/master
i:
  22545: 336dd38
  22543: ecd86d0
v: v3

Author: msullivan

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 08a4440d643fb6f7db90f67b40f9f29c6bdf5228
+refs/heads/master: b1dafe49afafd4650c4071cf64deaea113072eff
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/os.rs

@@ -554,7 +554,7 @@ fn list_dir(p: path) -> ~[~str] {
     fn star(p: ~str) -> ~str { p }
 
     #[cfg(windows)]
-    fn star(p: str) -> ~str {
+    fn star(p: ~str) -> ~str {
         let pl = str::len(p);
         if pl == 0u || (p[pl - 1u] as char != path::consts::path_sep
                         || p[pl - 1u] as char != path::consts::alt_path_sep) {

trunk/src/rustc/back/rpath.rs

@@ -314,32 +314,32 @@ mod test {
     #[test]
     #[cfg(target_os = "linux")]
     fn test_rpath_relative() {
-      let o = session::os_linux;
-      check not_win32(o);
-      let res = get_rpath_relative_to_output(o,
+        let o = session::os_linux;
+        check not_win32(o);
+        let res = get_rpath_relative_to_output(o,
             ~"/usr", ~"bin/rustc", ~"lib/libstd.so");
-      assert res == ~"$ORIGIN/../lib";
+        assert res == ~"$ORIGIN/../lib";
     }
 
     #[test]
     #[cfg(target_os = "freebsd")]
     fn test_rpath_relative() {
-      let o = session::os_freebsd;
-      check not_win32(o);
-      let res = get_rpath_relative_to_output(o,
-            "/usr", "bin/rustc", "lib/libstd.so");
-      assert res == "$ORIGIN/../lib";
+        let o = session::os_freebsd;
+        check not_win32(o);
+        let res = get_rpath_relative_to_output(o,
+            ~"/usr", ~"bin/rustc", ~"lib/libstd.so");
+        assert res == ~"$ORIGIN/../lib";
     }
 
     #[test]
     #[cfg(target_os = "macos")]
     fn test_rpath_relative() {
-      // this is why refinements would be nice
-      let o = session::os_macos;
-      check not_win32(o);
-      let res = get_rpath_relative_to_output(o, "/usr", "bin/rustc",
-                                             "lib/libstd.so");
-        assert res == "@executable_path/../lib";
+        // this is why refinements would be nice
+        let o = session::os_macos;
+        check not_win32(o);
+        let res = get_rpath_relative_to_output(o, ~"/usr", ~"bin/rustc",
+                                               ~"lib/libstd.so");
+        assert res == ~"@executable_path/../lib";
     }
 
     #[test]