Move src/comp to src/rustc

94 files changed, 6 insertions, 6 deletions

diff --git a/Makefile.in b/Makefile.in
index 20e6f06802a..9d6cdea27f6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -183,12 +183,12 @@ STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/libstd/,          \
 # rustc crate variables
 ######################################################################
 
-COMPILER_CRATE := $(S)src/comp/rustc.rc
-COMPILER_INPUTS := $(filter-out $(S)src/comp/driver/rustc.rs,     \
-                       $(wildcard $(addprefix $(S)src/comp/,      \
+COMPILER_CRATE := $(S)src/rustc/rustc.rc
+COMPILER_INPUTS := $(filter-out $(S)src/rustc/driver/rustc.rs,     \
+                       $(wildcard $(addprefix $(S)src/rustc/,      \
                            rustc.rc *.rs */*.rs */*/*.rs)))
 
-RUSTC_INPUTS := $(S)src/comp/driver/rustc.rs
+RUSTC_INPUTS := $(S)src/rustc/driver/rustc.rs
 
 ######################################################################
 # LLVM macros
diff --git a/mk/dist.mk b/mk/dist.mk
index 339e3efebd0..676e40f9d22 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -23,7 +23,7 @@ PKG_FILES := \
     $(addprefix $(S)src/,                      \
       README.txt                               \
       cargo                                    \
-      comp                                     \
+      rustc                                    \
       compiletest                              \
       etc                                      \
       fuzzer                                   \
diff --git a/mk/pp.mk b/mk/pp.mk
index df414901f7f..dd956216bbe 100644
--- a/mk/pp.mk
+++ b/mk/pp.mk
@@ -4,7 +4,7 @@ ifdef PPFILES
 else
   PP_INPUTS = $(wildcard $(addprefix $(S)src/libcore/,*.rs */*.rs)) \
               $(wildcard $(addprefix $(S)src/libstd/,*.rs */*.rs)) \
-              $(wildcard $(addprefix $(S)src/comp/,*.rs */*.rs */*/*.rs)) \
+              $(wildcard $(addprefix $(S)src/rustc/,*.rs */*.rs */*/*.rs)) \
               $(wildcard $(S)src/test/*/*.rs    \
                          $(S)src/test/*/*/*.rs) \
               $(wildcard $(S)src/fuzzer/*.rs)   \
diff --git a/src/comp/README.txt b/src/rustc/README.txt
index 9ee501c4c3b..9ee501c4c3b 100644
--- a/src/comp/README.txt
+++ b/src/rustc/README.txt
diff --git a/src/comp/back/abi.rs b/src/rustc/back/abi.rs
index c02960deb00..c02960deb00 100644
--- a/src/comp/back/abi.rs
+++ b/src/rustc/back/abi.rs
diff --git a/src/comp/back/link.rs b/src/rustc/back/link.rs
index c2cc106b3e2..c2cc106b3e2 100644
--- a/src/comp/back/link.rs
+++ b/src/rustc/back/link.rs
diff --git a/src/comp/back/rpath.rs b/src/rustc/back/rpath.rs
index cc74efa82cf..cc74efa82cf 100644
--- a/src/comp/back/rpath.rs
+++ b/src/rustc/back/rpath.rs
diff --git a/src/comp/back/target_strs.rs b/src/rustc/back/target_strs.rs
index cc40746b71c..cc40746b71c 100644
--- a/src/comp/back/target_strs.rs
+++ b/src/rustc/back/target_strs.rs
diff --git a/src/comp/back/upcall.rs b/src/rustc/back/upcall.rs
index 31ee139c524..31ee139c524 100644
--- a/src/comp/back/upcall.rs
+++ b/src/rustc/back/upcall.rs
diff --git a/src/comp/back/x86.rs b/src/rustc/back/x86.rs
index 3db3d1db50a..3db3d1db50a 100644
--- a/src/comp/back/x86.rs
+++ b/src/rustc/back/x86.rs
diff --git a/src/comp/back/x86_64.rs b/src/rustc/back/x86_64.rs
index 284152c23c6..284152c23c6 100644
--- a/src/comp/back/x86_64.rs
+++ b/src/rustc/back/x86_64.rs
diff --git a/src/comp/driver/diagnostic.rs b/src/rustc/driver/diagnostic.rs
index 8f0570a4349..8f0570a4349 100644
--- a/src/comp/driver/diagnostic.rs
+++ b/src/rustc/driver/diagnostic.rs
diff --git a/src/comp/driver/driver.rs b/src/rustc/driver/driver.rs
index 4aaabc667ba..4aaabc667ba 100644
--- a/src/comp/driver/driver.rs
+++ b/src/rustc/driver/driver.rs
diff --git a/src/comp/driver/rustc.rs b/src/rustc/driver/rustc.rs
index 8d0b8549062..8d0b8549062 100644
--- a/src/comp/driver/rustc.rs
+++ b/src/rustc/driver/rustc.rs
diff --git a/src/comp/driver/session.rs b/src/rustc/driver/session.rs
index ec2182d2929..ec2182d2929 100644
--- a/src/comp/driver/session.rs
+++ b/src/rustc/driver/session.rs
diff --git a/src/comp/front/attr.rs b/src/rustc/front/attr.rs
index 9a2aea62570..9a2aea62570 100644
--- a/src/comp/front/attr.rs
+++ b/src/rustc/front/attr.rs
diff --git a/src/comp/front/config.rs b/src/rustc/front/config.rs
index 44c88739069..44c88739069 100644
--- a/src/comp/front/config.rs
+++ b/src/rustc/front/config.rs
diff --git a/src/comp/front/core_inject.rs b/src/rustc/front/core_inject.rs
index b21967721c5..b21967721c5 100644
--- a/src/comp/front/core_inject.rs
+++ b/src/rustc/front/core_inject.rs
diff --git a/src/comp/front/test.rs b/src/rustc/front/test.rs
index 47cd3328755..47cd3328755 100644
--- a/src/comp/front/test.rs
+++ b/src/rustc/front/test.rs
diff --git a/src/comp/lib/llvm.rs b/src/rustc/lib/llvm.rs
index 2dc2945d8de..2dc2945d8de 100644
--- a/src/comp/lib/llvm.rs
+++ b/src/rustc/lib/llvm.rs
diff --git a/src/comp/metadata/astencode.rs b/src/rustc/metadata/astencode.rs
index bd1309c7c86..bd1309c7c86 100644
--- a/src/comp/metadata/astencode.rs
+++ b/src/rustc/metadata/astencode.rs
diff --git a/src/comp/metadata/astencode_gen.rs b/src/rustc/metadata/astencode_gen.rs
index 1c413de261c..1c413de261c 100644
--- a/src/comp/metadata/astencode_gen.rs
+++ b/src/rustc/metadata/astencode_gen.rs
diff --git a/src/comp/metadata/common.rs b/src/rustc/metadata/common.rs
index 4ccb3405560..4ccb3405560 100644
--- a/src/comp/metadata/common.rs
+++ b/src/rustc/metadata/common.rs
diff --git a/src/comp/metadata/creader.rs b/src/rustc/metadata/creader.rs
index 6222fc91e2c..6222fc91e2c 100644
--- a/src/comp/metadata/creader.rs
+++ b/src/rustc/metadata/creader.rs
diff --git a/src/comp/metadata/csearch.rs b/src/rustc/metadata/csearch.rs
index 7dbf8dde75a..7dbf8dde75a 100644
--- a/src/comp/metadata/csearch.rs
+++ b/src/rustc/metadata/csearch.rs
diff --git a/src/comp/metadata/cstore.rs b/src/rustc/metadata/cstore.rs
index e9dd1a010c5..e9dd1a010c5 100644
--- a/src/comp/metadata/cstore.rs
+++ b/src/rustc/metadata/cstore.rs
diff --git a/src/comp/metadata/decoder.rs b/src/rustc/metadata/decoder.rs
index 196789ee58c..196789ee58c 100644
--- a/src/comp/metadata/decoder.rs
+++ b/src/rustc/metadata/decoder.rs
diff --git a/src/comp/metadata/encoder.rs b/src/rustc/metadata/encoder.rs
index 2da07511628..2da07511628 100644
--- a/src/comp/metadata/encoder.rs
+++ b/src/rustc/metadata/encoder.rs
diff --git a/src/comp/metadata/tydecode.rs b/src/rustc/metadata/tydecode.rs
index 5d97777c0fb..5d97777c0fb 100644
--- a/src/comp/metadata/tydecode.rs
+++ b/src/rustc/metadata/tydecode.rs
diff --git a/src/comp/metadata/tyencode.rs b/src/rustc/metadata/tyencode.rs
index aa08e313dd7..aa08e313dd7 100644
--- a/src/comp/metadata/tyencode.rs
+++ b/src/rustc/metadata/tyencode.rs
diff --git a/src/comp/middle/alias.rs b/src/rustc/middle/alias.rs
index cb0785b4df1..cb0785b4df1 100644
--- a/src/comp/middle/alias.rs
+++ b/src/rustc/middle/alias.rs
diff --git a/src/comp/middle/ast_map.rs b/src/rustc/middle/ast_map.rs
index 673b3649191..673b3649191 100644
--- a/src/comp/middle/ast_map.rs
+++ b/src/rustc/middle/ast_map.rs
diff --git a/src/comp/middle/block_use.rs b/src/rustc/middle/block_use.rs
index f21dcd5cc40..f21dcd5cc40 100644
--- a/src/comp/middle/block_use.rs
+++ b/src/rustc/middle/block_use.rs
diff --git a/src/comp/middle/capture.rs b/src/rustc/middle/capture.rs
index c32623b30b1..c32623b30b1 100644
--- a/src/comp/middle/capture.rs
+++ b/src/rustc/middle/capture.rs
diff --git a/src/comp/middle/check_alt.rs b/src/rustc/middle/check_alt.rs
index 6d55aed095e..6d55aed095e 100644
--- a/src/comp/middle/check_alt.rs
+++ b/src/rustc/middle/check_alt.rs
diff --git a/src/comp/middle/check_const.rs b/src/rustc/middle/check_const.rs
index d04abffb320..d04abffb320 100644
--- a/src/comp/middle/check_const.rs
+++ b/src/rustc/middle/check_const.rs
diff --git a/src/comp/middle/fn_usage.rs b/src/rustc/middle/fn_usage.rs
index c415f5deb05..c415f5deb05 100644
--- a/src/comp/middle/fn_usage.rs
+++ b/src/rustc/middle/fn_usage.rs
diff --git a/src/comp/middle/freevars.rs b/src/rustc/middle/freevars.rs
index 65a4ae627ea..65a4ae627ea 100644
--- a/src/comp/middle/freevars.rs
+++ b/src/rustc/middle/freevars.rs
diff --git a/src/comp/middle/inline.rs b/src/rustc/middle/inline.rs
index 91d69168faf..91d69168faf 100644
--- a/src/comp/middle/inline.rs
+++ b/src/rustc/middle/inline.rs
diff --git a/src/comp/middle/kind.rs b/src/rustc/middle/kind.rs
index ffe2873a3b7..ffe2873a3b7 100644
--- a/src/comp/middle/kind.rs
+++ b/src/rustc/middle/kind.rs
diff --git a/src/comp/middle/last_use.rs b/src/rustc/middle/last_use.rs
index 12ffdfccb41..12ffdfccb41 100644
--- a/src/comp/middle/last_use.rs
+++ b/src/rustc/middle/last_use.rs
diff --git a/src/comp/middle/lint.rs b/src/rustc/middle/lint.rs
index f46a50ea4a1..f46a50ea4a1 100644
--- a/src/comp/middle/lint.rs
+++ b/src/rustc/middle/lint.rs
diff --git a/src/comp/middle/mutbl.rs b/src/rustc/middle/mutbl.rs
index 836b2631427..836b2631427 100644
--- a/src/comp/middle/mutbl.rs
+++ b/src/rustc/middle/mutbl.rs
diff --git a/src/comp/middle/pat_util.rs b/src/rustc/middle/pat_util.rs
index 1a6856e36bf..1a6856e36bf 100644
--- a/src/comp/middle/pat_util.rs
+++ b/src/rustc/middle/pat_util.rs
diff --git a/src/comp/middle/resolve.rs b/src/rustc/middle/resolve.rs
index 117641c9fe8..117641c9fe8 100644
--- a/src/comp/middle/resolve.rs
+++ b/src/rustc/middle/resolve.rs
diff --git a/src/comp/middle/trans/alt.rs b/src/rustc/middle/trans/alt.rs
index 29200a47287..29200a47287 100644
--- a/src/comp/middle/trans/alt.rs
+++ b/src/rustc/middle/trans/alt.rs
diff --git a/src/comp/middle/trans/base.rs b/src/rustc/middle/trans/base.rs
index 6947a6875c4..6947a6875c4 100644
--- a/src/comp/middle/trans/base.rs
+++ b/src/rustc/middle/trans/base.rs
diff --git a/src/comp/middle/trans/build.rs b/src/rustc/middle/trans/build.rs
index e449aae2382..e449aae2382 100644
--- a/src/comp/middle/trans/build.rs
+++ b/src/rustc/middle/trans/build.rs
diff --git a/src/comp/middle/trans/closure.rs b/src/rustc/middle/trans/closure.rs
index 4cd9eef01e3..4cd9eef01e3 100644
--- a/src/comp/middle/trans/closure.rs
+++ b/src/rustc/middle/trans/closure.rs
diff --git a/src/comp/middle/trans/common.rs b/src/rustc/middle/trans/common.rs
index 4bc264e4098..4bc264e4098 100644
--- a/src/comp/middle/trans/common.rs
+++ b/src/rustc/middle/trans/common.rs
diff --git a/src/comp/middle/trans/debuginfo.rs b/src/rustc/middle/trans/debuginfo.rs
index 47a3d2e5716..47a3d2e5716 100644
--- a/src/comp/middle/trans/debuginfo.rs
+++ b/src/rustc/middle/trans/debuginfo.rs
diff --git a/src/comp/middle/trans/impl.rs b/src/rustc/middle/trans/impl.rs
index b3660e3f672..b3660e3f672 100644
--- a/src/comp/middle/trans/impl.rs
+++ b/src/rustc/middle/trans/impl.rs
diff --git a/src/comp/middle/trans/native.rs b/src/rustc/middle/trans/native.rs
index 22791047ef9..22791047ef9 100644
--- a/src/comp/middle/trans/native.rs
+++ b/src/rustc/middle/trans/native.rs
diff --git a/src/comp/middle/trans/shape.rs b/src/rustc/middle/trans/shape.rs
index 2805778e927..2805778e927 100644
--- a/src/comp/middle/trans/shape.rs
+++ b/src/rustc/middle/trans/shape.rs
diff --git a/src/comp/middle/trans/tvec.rs b/src/rustc/middle/trans/tvec.rs
index aeaf65db7f4..aeaf65db7f4 100644
--- a/src/comp/middle/trans/tvec.rs
+++ b/src/rustc/middle/trans/tvec.rs
diff --git a/src/comp/middle/trans/type_of.rs b/src/rustc/middle/trans/type_of.rs
index f7095be55ff..f7095be55ff 100644
--- a/src/comp/middle/trans/type_of.rs
+++ b/src/rustc/middle/trans/type_of.rs
diff --git a/src/comp/middle/trans/uniq.rs b/src/rustc/middle/trans/uniq.rs
index d6d32510858..d6d32510858 100644
--- a/src/comp/middle/trans/uniq.rs
+++ b/src/rustc/middle/trans/uniq.rs
diff --git a/src/comp/middle/tstate/ann.rs b/src/rustc/middle/tstate/ann.rs
index f3862e3d20f..f3862e3d20f 100644
--- a/src/comp/middle/tstate/ann.rs
+++ b/src/rustc/middle/tstate/ann.rs
diff --git a/src/comp/middle/tstate/annotate.rs b/src/rustc/middle/tstate/annotate.rs
index d4271693112..d4271693112 100644
--- a/src/comp/middle/tstate/annotate.rs
+++ b/src/rustc/middle/tstate/annotate.rs
diff --git a/src/comp/middle/tstate/auxiliary.rs b/src/rustc/middle/tstate/auxiliary.rs
index df358a86004..df358a86004 100644
--- a/src/comp/middle/tstate/auxiliary.rs
+++ b/src/rustc/middle/tstate/auxiliary.rs
diff --git a/src/comp/middle/tstate/bitvectors.rs b/src/rustc/middle/tstate/bitvectors.rs
index 6acb23d906a..6acb23d906a 100644
--- a/src/comp/middle/tstate/bitvectors.rs
+++ b/src/rustc/middle/tstate/bitvectors.rs
diff --git a/src/comp/middle/tstate/ck.rs b/src/rustc/middle/tstate/ck.rs
index 08415119e4a..08415119e4a 100644
--- a/src/comp/middle/tstate/ck.rs
+++ b/src/rustc/middle/tstate/ck.rs
diff --git a/src/comp/middle/tstate/collect_locals.rs b/src/rustc/middle/tstate/collect_locals.rs
index 9b39814e141..9b39814e141 100644
--- a/src/comp/middle/tstate/collect_locals.rs
+++ b/src/rustc/middle/tstate/collect_locals.rs
diff --git a/src/comp/middle/tstate/pre_post_conditions.rs b/src/rustc/middle/tstate/pre_post_conditions.rs
index 8a83f7dd7b4..8a83f7dd7b4 100644
--- a/src/comp/middle/tstate/pre_post_conditions.rs
+++ b/src/rustc/middle/tstate/pre_post_conditions.rs
diff --git a/src/comp/middle/tstate/states.rs b/src/rustc/middle/tstate/states.rs
index b90e39f2b23..b90e39f2b23 100644
--- a/src/comp/middle/tstate/states.rs
+++ b/src/rustc/middle/tstate/states.rs
diff --git a/src/comp/middle/tstate/tritv.rs b/src/rustc/middle/tstate/tritv.rs
index 37cc22edf3b..37cc22edf3b 100644
--- a/src/comp/middle/tstate/tritv.rs
+++ b/src/rustc/middle/tstate/tritv.rs
diff --git a/src/comp/middle/ty.rs b/src/rustc/middle/ty.rs
index a7e218e581b..a7e218e581b 100644
--- a/src/comp/middle/ty.rs
+++ b/src/rustc/middle/ty.rs
diff --git a/src/comp/middle/typeck.rs b/src/rustc/middle/typeck.rs
index e1c56b9fc54..e1c56b9fc54 100644
--- a/src/comp/middle/typeck.rs
+++ b/src/rustc/middle/typeck.rs
diff --git a/src/comp/rustc.rc b/src/rustc/rustc.rc
index 8102e4d8cd8..8102e4d8cd8 100644
--- a/src/comp/rustc.rc
+++ b/src/rustc/rustc.rc
diff --git a/src/comp/syntax/ast.rs b/src/rustc/syntax/ast.rs
index eea47191eef..eea47191eef 100644
--- a/src/comp/syntax/ast.rs
+++ b/src/rustc/syntax/ast.rs
diff --git a/src/comp/syntax/ast_util.rs b/src/rustc/syntax/ast_util.rs
index 04bd4236c9b..04bd4236c9b 100644
--- a/src/comp/syntax/ast_util.rs
+++ b/src/rustc/syntax/ast_util.rs
diff --git a/src/comp/syntax/codemap.rs b/src/rustc/syntax/codemap.rs
index a7dbe574717..a7dbe574717 100644
--- a/src/comp/syntax/codemap.rs
+++ b/src/rustc/syntax/codemap.rs
diff --git a/src/comp/syntax/ext/base.rs b/src/rustc/syntax/ext/base.rs
index d59591d849a..d59591d849a 100644
--- a/src/comp/syntax/ext/base.rs
+++ b/src/rustc/syntax/ext/base.rs
diff --git a/src/comp/syntax/ext/build.rs b/src/rustc/syntax/ext/build.rs
index 5d615c4305d..5d615c4305d 100644
--- a/src/comp/syntax/ext/build.rs
+++ b/src/rustc/syntax/ext/build.rs
diff --git a/src/comp/syntax/ext/concat_idents.rs b/src/rustc/syntax/ext/concat_idents.rs
index 4b9402f9cd9..4b9402f9cd9 100644
--- a/src/comp/syntax/ext/concat_idents.rs
+++ b/src/rustc/syntax/ext/concat_idents.rs
diff --git a/src/comp/syntax/ext/env.rs b/src/rustc/syntax/ext/env.rs
index cb9453ae062..cb9453ae062 100644
--- a/src/comp/syntax/ext/env.rs
+++ b/src/rustc/syntax/ext/env.rs
diff --git a/src/comp/syntax/ext/expand.rs b/src/rustc/syntax/ext/expand.rs
index 104f49aebac..104f49aebac 100644
--- a/src/comp/syntax/ext/expand.rs
+++ b/src/rustc/syntax/ext/expand.rs
diff --git a/src/comp/syntax/ext/fmt.rs b/src/rustc/syntax/ext/fmt.rs
index 29b19a2d66c..29b19a2d66c 100644
--- a/src/comp/syntax/ext/fmt.rs
+++ b/src/rustc/syntax/ext/fmt.rs
diff --git a/src/comp/syntax/ext/ident_to_str.rs b/src/rustc/syntax/ext/ident_to_str.rs
index 2bb6dac7f2a..2bb6dac7f2a 100644
--- a/src/comp/syntax/ext/ident_to_str.rs
+++ b/src/rustc/syntax/ext/ident_to_str.rs
diff --git a/src/comp/syntax/ext/log_syntax.rs b/src/rustc/syntax/ext/log_syntax.rs
index 911cf9ff2eb..911cf9ff2eb 100644
--- a/src/comp/syntax/ext/log_syntax.rs
+++ b/src/rustc/syntax/ext/log_syntax.rs
diff --git a/src/comp/syntax/ext/qquote.rs b/src/rustc/syntax/ext/qquote.rs
index 7f7d5a387f0..7f7d5a387f0 100644
--- a/src/comp/syntax/ext/qquote.rs
+++ b/src/rustc/syntax/ext/qquote.rs
diff --git a/src/comp/syntax/ext/simplext.rs b/src/rustc/syntax/ext/simplext.rs
index 1baf5f97d20..1baf5f97d20 100644
--- a/src/comp/syntax/ext/simplext.rs
+++ b/src/rustc/syntax/ext/simplext.rs
diff --git a/src/comp/syntax/fold.rs b/src/rustc/syntax/fold.rs
index 7ceae548769..7ceae548769 100644
--- a/src/comp/syntax/fold.rs
+++ b/src/rustc/syntax/fold.rs
diff --git a/src/comp/syntax/parse/eval.rs b/src/rustc/syntax/parse/eval.rs
index 06f26905550..06f26905550 100644
--- a/src/comp/syntax/parse/eval.rs
+++ b/src/rustc/syntax/parse/eval.rs
diff --git a/src/comp/syntax/parse/lexer.rs b/src/rustc/syntax/parse/lexer.rs
index 3350d7a7c95..3350d7a7c95 100644
--- a/src/comp/syntax/parse/lexer.rs
+++ b/src/rustc/syntax/parse/lexer.rs
diff --git a/src/comp/syntax/parse/parser.rs b/src/rustc/syntax/parse/parser.rs
index 5837baf1ff9..5837baf1ff9 100644
--- a/src/comp/syntax/parse/parser.rs
+++ b/src/rustc/syntax/parse/parser.rs
diff --git a/src/comp/syntax/parse/token.rs b/src/rustc/syntax/parse/token.rs
index 60949f7793c..60949f7793c 100644
--- a/src/comp/syntax/parse/token.rs
+++ b/src/rustc/syntax/parse/token.rs
diff --git a/src/comp/syntax/print/pp.rs b/src/rustc/syntax/print/pp.rs
index 0b55bb8c356..0b55bb8c356 100644
--- a/src/comp/syntax/print/pp.rs
+++ b/src/rustc/syntax/print/pp.rs
diff --git a/src/comp/syntax/print/pprust.rs b/src/rustc/syntax/print/pprust.rs
index 5f92b5d5beb..5f92b5d5beb 100644
--- a/src/comp/syntax/print/pprust.rs
+++ b/src/rustc/syntax/print/pprust.rs
diff --git a/src/comp/syntax/util/interner.rs b/src/rustc/syntax/util/interner.rs
index c7f0d7ecb99..c7f0d7ecb99 100644
--- a/src/comp/syntax/util/interner.rs
+++ b/src/rustc/syntax/util/interner.rs
diff --git a/src/comp/syntax/visit.rs b/src/rustc/syntax/visit.rs
index 55958abd7af..55958abd7af 100644
--- a/src/comp/syntax/visit.rs
+++ b/src/rustc/syntax/visit.rs
diff --git a/src/comp/util/common.rs b/src/rustc/util/common.rs
index 87a1f6145d6..87a1f6145d6 100644
--- a/src/comp/util/common.rs
+++ b/src/rustc/util/common.rs
diff --git a/src/comp/util/filesearch.rs b/src/rustc/util/filesearch.rs
index 3e23e09f8ea..3e23e09f8ea 100644
--- a/src/comp/util/filesearch.rs
+++ b/src/rustc/util/filesearch.rs
diff --git a/src/comp/util/ppaux.rs b/src/rustc/util/ppaux.rs
index 0ed630629b7..0ed630629b7 100644
--- a/src/comp/util/ppaux.rs
+++ b/src/rustc/util/ppaux.rs