From a5d26a2e37b201d6adab839c1639edcf769432ab Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 20 Dec 2013 18:31:00 -0800 Subject: [PATCH] mk: Remove obsolete source reformatting rules --- Makefile.in | 5 ----- mk/pp.mk | 39 --------------------------------------- 2 files changed, 44 deletions(-) delete mode 100644 mk/pp.mk diff --git a/Makefile.in b/Makefile.in index 86d0e453b10..f5fdcd97aa6 100644 --- a/Makefile.in +++ b/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)) \ diff --git a/mk/pp.mk b/mk/pp.mk deleted file mode 100644 index 3d2af81f1c8..00000000000 --- 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 or the MIT license -# , 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