From eb9969f54699924e4373f6c447aaeb4dd041b0dd Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Thu, 16 Jun 2011 15:20:00 -0700
Subject: [PATCH] Add support for marking files no-reformat.

---
 mk/pp.mk                                   | 9 +++++++--
 src/test/run-pass/block-expr-precedence.rs | 2 ++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/mk/pp.mk b/mk/pp.mk
index 90e68e3665d..3d3d2dce073 100644
--- a/mk/pp.mk
+++ b/mk/pp.mk
@@ -4,9 +4,14 @@ PP_INPUTS := $(wildcard $(addprefix $(S)src/lib/,*.rs */*.rs)) \
              $(wildcard $(S)src/test/*/*.rs   \
                         $(S)src/test/*/*/*.rs)
 
+PP_INPUTS_FILTERED = $(shell echo $(PP_INPUTS) | xargs grep -L no-reformat)
+
 reformat: $(SREQ1)
 	@$(call E, reformat [stage1]: $@)
-	for i in $(PP_INPUTS);  \
+	for i in $(PP_INPUTS_FILTERED);  \
     do $(call CFG_RUN_TARG,stage1, stage1/rustc$(X)) \
-       --pretty normal $$i >$$i.tmp && mv $$i.tmp $$i; \
+       --pretty normal $$i >$$i.tmp; \
+    if cmp --silent $$i.tmp $$i; \
+        then echo no changes to $$i; rm $$i.tmp; \
+        else mv $$i.tmp $$i; fi \
     done
diff --git a/src/test/run-pass/block-expr-precedence.rs b/src/test/run-pass/block-expr-precedence.rs
index 9e9a01c6e66..84fb21f0c42 100644
--- a/src/test/run-pass/block-expr-precedence.rs
+++ b/src/test/run-pass/block-expr-precedence.rs
@@ -1,3 +1,5 @@
+// no-reformat
+
 /*
  *
  *  When you write a block-expression thing followed by