---

yaml
---
r: 90623
b: refs/heads/master
c: 5746e0c
h: refs/heads/master
i:
  90621: a5b4fc7
  90619: c99778f
  90615: 070f924
  90607: 44981e2
  90591: c0bc89a
  90559: 68fb40e
  90495: 3ad914d
  90367: 0c825d1
  90111: 89e9a89
v: v3

Author: jhasse

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 0478142b5f3bad7ced378e616e907fb216856225
+refs/heads/master: 5746e0cd2a07f656885667afc5825e91a966fe0c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
 refs/heads/try: b160761e35efcd1207112b3b782c06633cf441a8

trunk/Makefile.in

@@ -657,6 +657,11 @@ 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))  \

trunk/mk/clean.mk

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

trunk/mk/pp.mk

@@ -0,0 +1,39 @@
+# Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT
+# file at the top-level directory of this distribution and at
+# http://rust-lang.org/COPYRIGHT.
+#
+# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+# option. This file may not be copied, modified, or distributed
+# except according to those terms.
+
+# Create a way to reformat just some files
+ifdef PPFILES
+  PP_INPUTS_FILTERED := $(wildcard $(PPFILES))
+else
+  PP_INPUTS = $(wildcard $(addprefix $(S)src/libstd/,*.rs */*.rs)) \
+              $(wildcard $(addprefix $(S)src/libextra/,*.rs */*.rs)) \
+              $(wildcard $(addprefix $(S)src/rustc/,*.rs */*.rs */*/*.rs)) \
+              $(wildcard $(S)src/test/*/*.rs    \
+                         $(S)src/test/*/*/*.rs) \
+              $(wildcard $(S)src/rustpkg/*.rs) \
+              $(wildcard $(S)src/rust/*.rs)
+
+  PP_INPUTS_FILTERED = $(shell echo $(PP_INPUTS) | xargs grep -L \
+                       "no-reformat\|xfail-pretty\|xfail-test")
+endif
+
+reformat: $(SREQ1$(CFG_BUILD))
+	@$(call E, reformat [stage1]: $@)
+	for i in $(PP_INPUTS_FILTERED);  \
+    do $(call CFG_RUN_TARG_$(CFG_BUILD),1,$(CFG_BUILD)/stage1/rustc$(X_$(CFG_BUILD))) \
+       --pretty normal $$i >$$i.tmp; \
+    if [ $$? -ne 0 ]; \
+        then echo failed to print $$i; rm $$i.tmp; \
+        else if cmp --silent $$i.tmp $$i; \
+            then echo no changes to $$i; rm $$i.tmp; \
+            else echo reformated $$i; mv $$i.tmp $$i; \
+        fi; \
+    fi; \
+    done

trunk/mk/tests.mk

@@ -908,8 +908,6 @@ 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)
 
@@ -929,13 +927,6 @@ $(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
 

trunk/src/libextra/glob.rs

@@ -28,6 +28,8 @@ 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.
@@ -147,8 +149,9 @@ impl Iterator<Path> for GlobIterator {
 
 fn list_dir_sorted(path: &Path) -> ~[Path] {
     match io::result(|| fs::readdir(path)) {
-        Ok(mut children) => {
-            children.sort_by(|p1, p2| p2.filename().cmp(&p1.filename()));
+        Ok(children) => {
+            let mut children = children;
+            sort::quick_sort(children, |p1, p2| p2.filename() <= p1.filename());
             children
         }
         Err(..) => ~[]
@@ -768,3 +771,4 @@ mod test {
         assert!(Pattern::new("a/b").matches_path(&Path::new("a/b")));
     }
 }
+

trunk/src/libextra/lib.rs

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

trunk/src/libextra/priority_queue.rs

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