]> git.lizzy.rs Git - rust.git/commitdiff
mk: Remove obsolete source reformatting rules
authorBrian Anderson <banderson@mozilla.com>
Sat, 21 Dec 2013 02:31:00 +0000 (18:31 -0800)
committerBrian Anderson <banderson@mozilla.com>
Sat, 21 Dec 2013 02:31:00 +0000 (18:31 -0800)
Makefile.in
mk/pp.mk [deleted file]

index 86d0e453b1082acf95191dd9965007f37bf57a41..f5fdcd97aa64d6e83ba6aa01447eaacea8b44a7e 100644 (file)
@@ -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))  \
diff --git a/mk/pp.mk b/mk/pp.mk
deleted file mode 100644 (file)
index 3d2af81..0000000
--- a/mk/pp.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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