---

yaml
---
r: 7147
b: refs/heads/master
c: f6ecbe8
h: refs/heads/master
i:
  7145: 83b6bb5
  7143: 9cf64e3
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ae76a7db5d5747aad7e572911848800e139f127b
+refs/heads/master: f6ecbe88ca67769ccb9def337ada9ae25235e00e

trunk/src/comp/back/rpath.rs

@@ -218,8 +218,8 @@ mod test {
     #[test]
     fn test_prefix_rpath() {
         let res = get_install_prefix_rpath("/usr/lib", "triple");
-        assert str::ends_with(res, #env("CFG_PREFIX")
-                              + "/lib/rustc/triple/lib");
+        let d = fs::connect(#env("CFG_PREFIX"), "/lib/rustc/triple/lib");
+        assert str::ends_with(res, d);
     }
 
     #[test]

trunk/src/libcore/ctypes.rs

@@ -32,13 +32,6 @@ A signed integer with the same size as a C `long`
 */
 type long = int;
 
-/*
-Type: longlong
-
-A signed integer with the same size as a C `long long`
-*/
-type longlong = i64;
-
 /*
 Type: unsigned
 
@@ -53,13 +46,6 @@ An unsigned integer with the same size as a C `unsigned long`
 */
 type ulong = uint;
 
-/*
-Type: ulonglong
-
-An unsigned integer with the same size as a C `unsigned long long`
-*/
-type ulonglong = u64;
-
 /*
 Type: intptr_t
 

trunk/src/libstd/fs.rs

@@ -81,17 +81,20 @@ Function: connect
 
 Connects to path segments
 
-Given paths `pre` and `post` this function will return a path
-that is equal to `post` appended to `pre`, inserting a path separator
-between the two as needed.
+Given paths `pre` and `post, removes any trailing path separator on `pre` and
+any leading path separator on `post`, and returns the concatenation of the two
+with a single path separator between them.
 */
-fn connect(pre: path, post: path) -> path {
-    let len = str::byte_len(pre);
-    ret if pre[len - 1u] == os_fs::path_sep as u8 {
 
-            // Trailing '/'?
-            pre + post
-        } else { pre + path_sep() + post };
+fn connect(pre: path, post: path) -> path {
+    let pre_ = pre;
+    let post_ = post;
+    let sep = os_fs::path_sep as u8;
+    let pre_len = str::byte_len(pre);
+    let post_len = str::byte_len(post);
+    if pre_len > 1u && pre[pre_len-1u] == sep { str::pop_byte(pre_); }
+    if post_len > 1u && post[0] == sep { str::shift_byte(post_); }
+    ret pre_ + path_sep() + post_;
 }
 
 /*