---

yaml
---
r: 81860
b: refs/heads/master
c: 2265416
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: b6f74e696f790c18f6a2f720529a6c93514a8da2
+refs/heads/master: 22654165c697cac912159daedbfb731fbc7c175d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729

trunk/configure

@@ -848,8 +848,6 @@ do
         # Disable term-info, linkage of which comes in multiple forms,
         # making our snapshots incompatible (#9334)
         LLVM_OPTS="$LLVM_OPTS --disable-terminfo"
-        # Try to have LLVM pull in as few dependencies as possible (#9397)
-        LLVM_OPTS="$LLVM_OPTS --disable-zlib --disable-libffi"
 
         case "$CFG_C_COMPILER" in
             ("ccache clang")

trunk/src/libstd/path.rs

@@ -233,6 +233,21 @@ pub trait GenericPath : Clone + Eq + ToStr {
         result
     }
 
+
+    /// Returns `true` iff `child` is a suffix of `parent`. See the test
+    /// case for examples.
+    pub fn is_parent_of(parent: &Path, child: &Path) -> bool {
+        if !parent.is_absolute() || child.is_absolute()
+            || parent.components.len() < child.components.len()
+            || parent.components.is_empty() {
+            return false;
+        }
+        let child_components = child.components().len();
+        let parent_components = parent.components().len();
+        let to_drop = parent.components.len() - child_components;
+        parent.components.slice(to_drop, parent_components) == child.components
+    }
+
     fn components<'a>(&'a self) -> &'a [~str];
 }
 
@@ -1450,4 +1465,34 @@ mod tests {
 
     }
 
+
+    #[test]
+    fn test_is_parent_of() {
+        assert!(is_parent_of(&PosixPath("/a/b/c/d/e"), &PosixPath("c/d/e")));
+        assert!(!is_parent_of(&PosixPath("a/b/c/d/e"), &PosixPath("c/d/e")));
+        assert!(!is_parent_of(&PosixPath("/a/b/c/d/e"), &PosixPath("/c/d/e")));
+        assert!(!is_parent_of(&PosixPath(""), &PosixPath("")));
+        assert!(!is_parent_of(&PosixPath(""), &PosixPath("a/b/c")));
+        assert!(is_parent_of(&PosixPath("/a/b/c"), &PosixPath("")));
+        assert!(is_parent_of(&PosixPath("/a/b/c"), &PosixPath("a/b/c")));
+        assert!(!is_parent_of(&PosixPath("/a/b/c"), &PosixPath("d/e/f")));
+
+        let abcde = WindowsPath("C:\\a\\b\\c\\d\\e");
+        let rel_abcde = WindowsPath("a\\b\\c\\d\\e");
+        let cde   = WindowsPath("c\\d\\e");
+        let slashcde = WindowsPath("C:\\c\\d\\e");
+        let empty = WindowsPath("");
+        let abc = WindowsPath("C:\\a\\b\\c");
+        let rel_abc = WindowsPath("a\\b\\c");
+        let def = WindowsPath("d\\e\\f");
+
+        assert!(is_parent_of(&abcde, &cde));
+        assert!(!is_parent_of(&rel_abcde, &cde));
+        assert!(!is_parent_of(&abcde, &slashcde));
+        assert!(!is_parent_of(&empty, &empty));
+        assert!(is_parent_of(&abc, &empty);
+        assert!(is_parent_of(&abc, &rel_abc));
+        assert!(!is_parent_of(&abc, &def));
+    }
+
 }

trunk/src/rustllvm/llvm-auto-clean-trigger

@@ -1,4 +1,4 @@
 # If this file is modified, then llvm will be forcibly cleaned and then rebuilt.
 # The actual contents of this file do not matter, but to trigger a change on the
 # build bots then the contents should be changed so git updates the mtime.
-2013-09-23
+2013-09-22