---

yaml
---
r: 94465
b: refs/heads/try
c: 1b4bbc8
h: refs/heads/master
i:
  94463: 665e1eb
v: v3

Author: bors

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: 2490b59da0c13818346890dac087238532df59a2
+refs/heads/try: 1b4bbc89b3ce40dc95abec688c322fef798292f1
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/Makefile.in

@@ -657,11 +657,6 @@ ifneq ($(strip $(findstring snap,$(MAKECMDGOALS))   \
   include $(CFG_SRC_DIR)mk/snap.mk
 endif
 
-ifneq ($(findstring reformat,$(MAKECMDGOALS)),)
-  CFG_INFO := $(info cfg: including reformat rules)
-  include $(CFG_SRC_DIR)mk/pp.mk
-endif
-
 ifneq ($(strip $(findstring check,$(MAKECMDGOALS)) \
                $(findstring test,$(MAKECMDGOALS))  \
                $(findstring perf,$(MAKECMDGOALS))  \

branches/try/mk/clean.mk

@@ -63,6 +63,7 @@ clean-generic-$(2)-$(1):
          -name '*.[odasS]' -o \
          -name '*.so' -o      \
          -name '*.dylib' -o   \
+         -name '*.lib' -o     \
          -name '*.dll' -o     \
          -name '*.def' -o     \
          -name '*.bc'         \

branches/try/mk/pp.mk

@@ -908,6 +908,8 @@ define DEF_RMAKE_FOR_T_H
 # $(2) target triple
 # $(3) host triple
 
+
+ifeq ($(2)$(3),$$(CFG_BUILD)$$(CFG_BUILD))
 check-stage$(1)-T-$(2)-H-$(3)-rmake-exec: \
 		$$(call TEST_OK_FILE,$(1),$(2),$(3),rmake)
 
@@ -927,6 +929,13 @@ $(3)/test/run-make/%-$(1)-T-$(2)-H-$(3).ok: \
 	    "$$(CC_$(3)) $$(CFG_GCCISH_CFLAGS_$(3))" \
 	    $$(HBIN$(1)_H_$(3))/rustdoc$$(X_$(3))
 	@touch $$@
+else
+# FIXME #11094 - The above rule doesn't work right for multiple targets
+check-stage$(1)-T-$(2)-H-$(3)-rmake-exec:
+	@true
+
+endif
+
 
 endef
 

branches/try/mk/tests.mk

@@ -28,8 +28,6 @@ use std::io;
 use std::io::fs;
 use std::path::is_sep;
 
-use sort;
-
 /**
  * An iterator that yields Paths from the filesystem that match a particular
  * pattern - see the `glob` function for more details.
@@ -149,9 +147,8 @@ impl Iterator<Path> for GlobIterator {
 
 fn list_dir_sorted(path: &Path) -> ~[Path] {
     match io::result(|| fs::readdir(path)) {
-        Ok(children) => {
-            let mut children = children;
-            sort::quick_sort(children, |p1, p2| p2.filename() <= p1.filename());
+        Ok(mut children) => {
+            children.sort_by(|p1, p2| p2.filename().cmp(&p1.filename()));
             children
         }
         Err(..) => ~[]
@@ -771,4 +768,3 @@ mod test {
         assert!(Pattern::new("a/b").matches_path(&Path::new("a/b")));
     }
 }
-

branches/try/src/libextra/glob.rs

@@ -61,8 +61,6 @@ pub mod ringbuf;
 pub mod priority_queue;
 pub mod smallintmap;
 
-pub mod sort;
-
 pub mod dlist;
 pub mod treemap;
 pub mod btree;

branches/try/src/libextra/lib.rs

@@ -213,7 +213,6 @@ impl<T: Ord> Extendable<T> for PriorityQueue<T> {
 
 #[cfg(test)]
 mod tests {
-    use sort::merge_sort;
     use priority_queue::PriorityQueue;
 
     #[test]
@@ -231,7 +230,8 @@ mod tests {
     #[test]
     fn test_top_and_pop() {
         let data = ~[2u, 4, 6, 2, 1, 8, 10, 3, 5, 7, 0, 9, 1];
-        let mut sorted = merge_sort(data, |x, y| x.le(y));
+        let mut sorted = data.clone();
+        sorted.sort();
         let mut heap = PriorityQueue::from_vec(data);
         while !heap.is_empty() {
             assert_eq!(heap.top(), sorted.last());
@@ -311,11 +311,14 @@ mod tests {
         assert_eq!(heap.len(), 5);
     }
 
-    fn check_to_vec(data: ~[int]) {
+    fn check_to_vec(mut data: ~[int]) {
         let heap = PriorityQueue::from_vec(data.clone());
-        assert_eq!(merge_sort(heap.clone().to_vec(), |x, y| x.le(y)),
-                   merge_sort(data, |x, y| x.le(y)));
-        assert_eq!(heap.to_sorted_vec(), merge_sort(data, |x, y| x.le(y)));
+        let mut v = heap.clone().to_vec();
+        v.sort();
+        data.sort();
+
+        assert_eq!(v, data);
+        assert_eq!(heap.to_sorted_vec(), data);
     }
 
     #[test]