From 87c14f1e3d85751bffffda0b1920be5e726172c4 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Wed, 29 Feb 2012 11:46:23 -0800
Subject: [PATCH] Move src/comp to src/rustc

---
 Makefile.in                                              | 8 ++++----
 mk/dist.mk                                               | 2 +-
 mk/pp.mk                                                 | 2 +-
 src/{comp => rustc}/README.txt                           | 0
 src/{comp => rustc}/back/abi.rs                          | 0
 src/{comp => rustc}/back/link.rs                         | 0
 src/{comp => rustc}/back/rpath.rs                        | 0
 src/{comp => rustc}/back/target_strs.rs                  | 0
 src/{comp => rustc}/back/upcall.rs                       | 0
 src/{comp => rustc}/back/x86.rs                          | 0
 src/{comp => rustc}/back/x86_64.rs                       | 0
 src/{comp => rustc}/driver/diagnostic.rs                 | 0
 src/{comp => rustc}/driver/driver.rs                     | 0
 src/{comp => rustc}/driver/rustc.rs                      | 0
 src/{comp => rustc}/driver/session.rs                    | 0
 src/{comp => rustc}/front/attr.rs                        | 0
 src/{comp => rustc}/front/config.rs                      | 0
 src/{comp => rustc}/front/core_inject.rs                 | 0
 src/{comp => rustc}/front/test.rs                        | 0
 src/{comp => rustc}/lib/llvm.rs                          | 0
 src/{comp => rustc}/metadata/astencode.rs                | 0
 src/{comp => rustc}/metadata/astencode_gen.rs            | 0
 src/{comp => rustc}/metadata/common.rs                   | 0
 src/{comp => rustc}/metadata/creader.rs                  | 0
 src/{comp => rustc}/metadata/csearch.rs                  | 0
 src/{comp => rustc}/metadata/cstore.rs                   | 0
 src/{comp => rustc}/metadata/decoder.rs                  | 0
 src/{comp => rustc}/metadata/encoder.rs                  | 0
 src/{comp => rustc}/metadata/tydecode.rs                 | 0
 src/{comp => rustc}/metadata/tyencode.rs                 | 0
 src/{comp => rustc}/middle/alias.rs                      | 0
 src/{comp => rustc}/middle/ast_map.rs                    | 0
 src/{comp => rustc}/middle/block_use.rs                  | 0
 src/{comp => rustc}/middle/capture.rs                    | 0
 src/{comp => rustc}/middle/check_alt.rs                  | 0
 src/{comp => rustc}/middle/check_const.rs                | 0
 src/{comp => rustc}/middle/fn_usage.rs                   | 0
 src/{comp => rustc}/middle/freevars.rs                   | 0
 src/{comp => rustc}/middle/inline.rs                     | 0
 src/{comp => rustc}/middle/kind.rs                       | 0
 src/{comp => rustc}/middle/last_use.rs                   | 0
 src/{comp => rustc}/middle/lint.rs                       | 0
 src/{comp => rustc}/middle/mutbl.rs                      | 0
 src/{comp => rustc}/middle/pat_util.rs                   | 0
 src/{comp => rustc}/middle/resolve.rs                    | 0
 src/{comp => rustc}/middle/trans/alt.rs                  | 0
 src/{comp => rustc}/middle/trans/base.rs                 | 0
 src/{comp => rustc}/middle/trans/build.rs                | 0
 src/{comp => rustc}/middle/trans/closure.rs              | 0
 src/{comp => rustc}/middle/trans/common.rs               | 0
 src/{comp => rustc}/middle/trans/debuginfo.rs            | 0
 src/{comp => rustc}/middle/trans/impl.rs                 | 0
 src/{comp => rustc}/middle/trans/native.rs               | 0
 src/{comp => rustc}/middle/trans/shape.rs                | 0
 src/{comp => rustc}/middle/trans/tvec.rs                 | 0
 src/{comp => rustc}/middle/trans/type_of.rs              | 0
 src/{comp => rustc}/middle/trans/uniq.rs                 | 0
 src/{comp => rustc}/middle/tstate/ann.rs                 | 0
 src/{comp => rustc}/middle/tstate/annotate.rs            | 0
 src/{comp => rustc}/middle/tstate/auxiliary.rs           | 0
 src/{comp => rustc}/middle/tstate/bitvectors.rs          | 0
 src/{comp => rustc}/middle/tstate/ck.rs                  | 0
 src/{comp => rustc}/middle/tstate/collect_locals.rs      | 0
 src/{comp => rustc}/middle/tstate/pre_post_conditions.rs | 0
 src/{comp => rustc}/middle/tstate/states.rs              | 0
 src/{comp => rustc}/middle/tstate/tritv.rs               | 0
 src/{comp => rustc}/middle/ty.rs                         | 0
 src/{comp => rustc}/middle/typeck.rs                     | 0
 src/{comp => rustc}/rustc.rc                             | 0
 src/{comp => rustc}/syntax/ast.rs                        | 0
 src/{comp => rustc}/syntax/ast_util.rs                   | 0
 src/{comp => rustc}/syntax/codemap.rs                    | 0
 src/{comp => rustc}/syntax/ext/base.rs                   | 0
 src/{comp => rustc}/syntax/ext/build.rs                  | 0
 src/{comp => rustc}/syntax/ext/concat_idents.rs          | 0
 src/{comp => rustc}/syntax/ext/env.rs                    | 0
 src/{comp => rustc}/syntax/ext/expand.rs                 | 0
 src/{comp => rustc}/syntax/ext/fmt.rs                    | 0
 src/{comp => rustc}/syntax/ext/ident_to_str.rs           | 0
 src/{comp => rustc}/syntax/ext/log_syntax.rs             | 0
 src/{comp => rustc}/syntax/ext/qquote.rs                 | 0
 src/{comp => rustc}/syntax/ext/simplext.rs               | 0
 src/{comp => rustc}/syntax/fold.rs                       | 0
 src/{comp => rustc}/syntax/parse/eval.rs                 | 0
 src/{comp => rustc}/syntax/parse/lexer.rs                | 0
 src/{comp => rustc}/syntax/parse/parser.rs               | 0
 src/{comp => rustc}/syntax/parse/token.rs                | 0
 src/{comp => rustc}/syntax/print/pp.rs                   | 0
 src/{comp => rustc}/syntax/print/pprust.rs               | 0
 src/{comp => rustc}/syntax/util/interner.rs              | 0
 src/{comp => rustc}/syntax/visit.rs                      | 0
 src/{comp => rustc}/util/common.rs                       | 0
 src/{comp => rustc}/util/filesearch.rs                   | 0
 src/{comp => rustc}/util/ppaux.rs                        | 0
 94 files changed, 6 insertions(+), 6 deletions(-)
 rename src/{comp => rustc}/README.txt (100%)
 rename src/{comp => rustc}/back/abi.rs (100%)
 rename src/{comp => rustc}/back/link.rs (100%)
 rename src/{comp => rustc}/back/rpath.rs (100%)
 rename src/{comp => rustc}/back/target_strs.rs (100%)
 rename src/{comp => rustc}/back/upcall.rs (100%)
 rename src/{comp => rustc}/back/x86.rs (100%)
 rename src/{comp => rustc}/back/x86_64.rs (100%)
 rename src/{comp => rustc}/driver/diagnostic.rs (100%)
 rename src/{comp => rustc}/driver/driver.rs (100%)
 rename src/{comp => rustc}/driver/rustc.rs (100%)
 rename src/{comp => rustc}/driver/session.rs (100%)
 rename src/{comp => rustc}/front/attr.rs (100%)
 rename src/{comp => rustc}/front/config.rs (100%)
 rename src/{comp => rustc}/front/core_inject.rs (100%)
 rename src/{comp => rustc}/front/test.rs (100%)
 rename src/{comp => rustc}/lib/llvm.rs (100%)
 rename src/{comp => rustc}/metadata/astencode.rs (100%)
 rename src/{comp => rustc}/metadata/astencode_gen.rs (100%)
 rename src/{comp => rustc}/metadata/common.rs (100%)
 rename src/{comp => rustc}/metadata/creader.rs (100%)
 rename src/{comp => rustc}/metadata/csearch.rs (100%)
 rename src/{comp => rustc}/metadata/cstore.rs (100%)
 rename src/{comp => rustc}/metadata/decoder.rs (100%)
 rename src/{comp => rustc}/metadata/encoder.rs (100%)
 rename src/{comp => rustc}/metadata/tydecode.rs (100%)
 rename src/{comp => rustc}/metadata/tyencode.rs (100%)
 rename src/{comp => rustc}/middle/alias.rs (100%)
 rename src/{comp => rustc}/middle/ast_map.rs (100%)
 rename src/{comp => rustc}/middle/block_use.rs (100%)
 rename src/{comp => rustc}/middle/capture.rs (100%)
 rename src/{comp => rustc}/middle/check_alt.rs (100%)
 rename src/{comp => rustc}/middle/check_const.rs (100%)
 rename src/{comp => rustc}/middle/fn_usage.rs (100%)
 rename src/{comp => rustc}/middle/freevars.rs (100%)
 rename src/{comp => rustc}/middle/inline.rs (100%)
 rename src/{comp => rustc}/middle/kind.rs (100%)
 rename src/{comp => rustc}/middle/last_use.rs (100%)
 rename src/{comp => rustc}/middle/lint.rs (100%)
 rename src/{comp => rustc}/middle/mutbl.rs (100%)
 rename src/{comp => rustc}/middle/pat_util.rs (100%)
 rename src/{comp => rustc}/middle/resolve.rs (100%)
 rename src/{comp => rustc}/middle/trans/alt.rs (100%)
 rename src/{comp => rustc}/middle/trans/base.rs (100%)
 rename src/{comp => rustc}/middle/trans/build.rs (100%)
 rename src/{comp => rustc}/middle/trans/closure.rs (100%)
 rename src/{comp => rustc}/middle/trans/common.rs (100%)
 rename src/{comp => rustc}/middle/trans/debuginfo.rs (100%)
 rename src/{comp => rustc}/middle/trans/impl.rs (100%)
 rename src/{comp => rustc}/middle/trans/native.rs (100%)
 rename src/{comp => rustc}/middle/trans/shape.rs (100%)
 rename src/{comp => rustc}/middle/trans/tvec.rs (100%)
 rename src/{comp => rustc}/middle/trans/type_of.rs (100%)
 rename src/{comp => rustc}/middle/trans/uniq.rs (100%)
 rename src/{comp => rustc}/middle/tstate/ann.rs (100%)
 rename src/{comp => rustc}/middle/tstate/annotate.rs (100%)
 rename src/{comp => rustc}/middle/tstate/auxiliary.rs (100%)
 rename src/{comp => rustc}/middle/tstate/bitvectors.rs (100%)
 rename src/{comp => rustc}/middle/tstate/ck.rs (100%)
 rename src/{comp => rustc}/middle/tstate/collect_locals.rs (100%)
 rename src/{comp => rustc}/middle/tstate/pre_post_conditions.rs (100%)
 rename src/{comp => rustc}/middle/tstate/states.rs (100%)
 rename src/{comp => rustc}/middle/tstate/tritv.rs (100%)
 rename src/{comp => rustc}/middle/ty.rs (100%)
 rename src/{comp => rustc}/middle/typeck.rs (100%)
 rename src/{comp => rustc}/rustc.rc (100%)
 rename src/{comp => rustc}/syntax/ast.rs (100%)
 rename src/{comp => rustc}/syntax/ast_util.rs (100%)
 rename src/{comp => rustc}/syntax/codemap.rs (100%)
 rename src/{comp => rustc}/syntax/ext/base.rs (100%)
 rename src/{comp => rustc}/syntax/ext/build.rs (100%)
 rename src/{comp => rustc}/syntax/ext/concat_idents.rs (100%)
 rename src/{comp => rustc}/syntax/ext/env.rs (100%)
 rename src/{comp => rustc}/syntax/ext/expand.rs (100%)
 rename src/{comp => rustc}/syntax/ext/fmt.rs (100%)
 rename src/{comp => rustc}/syntax/ext/ident_to_str.rs (100%)
 rename src/{comp => rustc}/syntax/ext/log_syntax.rs (100%)
 rename src/{comp => rustc}/syntax/ext/qquote.rs (100%)
 rename src/{comp => rustc}/syntax/ext/simplext.rs (100%)
 rename src/{comp => rustc}/syntax/fold.rs (100%)
 rename src/{comp => rustc}/syntax/parse/eval.rs (100%)
 rename src/{comp => rustc}/syntax/parse/lexer.rs (100%)
 rename src/{comp => rustc}/syntax/parse/parser.rs (100%)
 rename src/{comp => rustc}/syntax/parse/token.rs (100%)
 rename src/{comp => rustc}/syntax/print/pp.rs (100%)
 rename src/{comp => rustc}/syntax/print/pprust.rs (100%)
 rename src/{comp => rustc}/syntax/util/interner.rs (100%)
 rename src/{comp => rustc}/syntax/visit.rs (100%)
 rename src/{comp => rustc}/util/common.rs (100%)
 rename src/{comp => rustc}/util/filesearch.rs (100%)
 rename src/{comp => rustc}/util/ppaux.rs (100%)

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
similarity index 100%
rename from src/comp/README.txt
rename to src/rustc/README.txt
diff --git a/src/comp/back/abi.rs b/src/rustc/back/abi.rs
similarity index 100%
rename from src/comp/back/abi.rs
rename to src/rustc/back/abi.rs
diff --git a/src/comp/back/link.rs b/src/rustc/back/link.rs
similarity index 100%
rename from src/comp/back/link.rs
rename to src/rustc/back/link.rs
diff --git a/src/comp/back/rpath.rs b/src/rustc/back/rpath.rs
similarity index 100%
rename from src/comp/back/rpath.rs
rename to src/rustc/back/rpath.rs
diff --git a/src/comp/back/target_strs.rs b/src/rustc/back/target_strs.rs
similarity index 100%
rename from src/comp/back/target_strs.rs
rename to src/rustc/back/target_strs.rs
diff --git a/src/comp/back/upcall.rs b/src/rustc/back/upcall.rs
similarity index 100%
rename from src/comp/back/upcall.rs
rename to src/rustc/back/upcall.rs
diff --git a/src/comp/back/x86.rs b/src/rustc/back/x86.rs
similarity index 100%
rename from src/comp/back/x86.rs
rename to src/rustc/back/x86.rs
diff --git a/src/comp/back/x86_64.rs b/src/rustc/back/x86_64.rs
similarity index 100%
rename from src/comp/back/x86_64.rs
rename to src/rustc/back/x86_64.rs
diff --git a/src/comp/driver/diagnostic.rs b/src/rustc/driver/diagnostic.rs
similarity index 100%
rename from src/comp/driver/diagnostic.rs
rename to src/rustc/driver/diagnostic.rs
diff --git a/src/comp/driver/driver.rs b/src/rustc/driver/driver.rs
similarity index 100%
rename from src/comp/driver/driver.rs
rename to src/rustc/driver/driver.rs
diff --git a/src/comp/driver/rustc.rs b/src/rustc/driver/rustc.rs
similarity index 100%
rename from src/comp/driver/rustc.rs
rename to src/rustc/driver/rustc.rs
diff --git a/src/comp/driver/session.rs b/src/rustc/driver/session.rs
similarity index 100%
rename from src/comp/driver/session.rs
rename to src/rustc/driver/session.rs
diff --git a/src/comp/front/attr.rs b/src/rustc/front/attr.rs
similarity index 100%
rename from src/comp/front/attr.rs
rename to src/rustc/front/attr.rs
diff --git a/src/comp/front/config.rs b/src/rustc/front/config.rs
similarity index 100%
rename from src/comp/front/config.rs
rename to src/rustc/front/config.rs
diff --git a/src/comp/front/core_inject.rs b/src/rustc/front/core_inject.rs
similarity index 100%
rename from src/comp/front/core_inject.rs
rename to src/rustc/front/core_inject.rs
diff --git a/src/comp/front/test.rs b/src/rustc/front/test.rs
similarity index 100%
rename from src/comp/front/test.rs
rename to src/rustc/front/test.rs
diff --git a/src/comp/lib/llvm.rs b/src/rustc/lib/llvm.rs
similarity index 100%
rename from src/comp/lib/llvm.rs
rename to src/rustc/lib/llvm.rs
diff --git a/src/comp/metadata/astencode.rs b/src/rustc/metadata/astencode.rs
similarity index 100%
rename from src/comp/metadata/astencode.rs
rename to src/rustc/metadata/astencode.rs
diff --git a/src/comp/metadata/astencode_gen.rs b/src/rustc/metadata/astencode_gen.rs
similarity index 100%
rename from src/comp/metadata/astencode_gen.rs
rename to src/rustc/metadata/astencode_gen.rs
diff --git a/src/comp/metadata/common.rs b/src/rustc/metadata/common.rs
similarity index 100%
rename from src/comp/metadata/common.rs
rename to src/rustc/metadata/common.rs
diff --git a/src/comp/metadata/creader.rs b/src/rustc/metadata/creader.rs
similarity index 100%
rename from src/comp/metadata/creader.rs
rename to src/rustc/metadata/creader.rs
diff --git a/src/comp/metadata/csearch.rs b/src/rustc/metadata/csearch.rs
similarity index 100%
rename from src/comp/metadata/csearch.rs
rename to src/rustc/metadata/csearch.rs
diff --git a/src/comp/metadata/cstore.rs b/src/rustc/metadata/cstore.rs
similarity index 100%
rename from src/comp/metadata/cstore.rs
rename to src/rustc/metadata/cstore.rs
diff --git a/src/comp/metadata/decoder.rs b/src/rustc/metadata/decoder.rs
similarity index 100%
rename from src/comp/metadata/decoder.rs
rename to src/rustc/metadata/decoder.rs
diff --git a/src/comp/metadata/encoder.rs b/src/rustc/metadata/encoder.rs
similarity index 100%
rename from src/comp/metadata/encoder.rs
rename to src/rustc/metadata/encoder.rs
diff --git a/src/comp/metadata/tydecode.rs b/src/rustc/metadata/tydecode.rs
similarity index 100%
rename from src/comp/metadata/tydecode.rs
rename to src/rustc/metadata/tydecode.rs
diff --git a/src/comp/metadata/tyencode.rs b/src/rustc/metadata/tyencode.rs
similarity index 100%
rename from src/comp/metadata/tyencode.rs
rename to src/rustc/metadata/tyencode.rs
diff --git a/src/comp/middle/alias.rs b/src/rustc/middle/alias.rs
similarity index 100%
rename from src/comp/middle/alias.rs
rename to src/rustc/middle/alias.rs
diff --git a/src/comp/middle/ast_map.rs b/src/rustc/middle/ast_map.rs
similarity index 100%
rename from src/comp/middle/ast_map.rs
rename to src/rustc/middle/ast_map.rs
diff --git a/src/comp/middle/block_use.rs b/src/rustc/middle/block_use.rs
similarity index 100%
rename from src/comp/middle/block_use.rs
rename to src/rustc/middle/block_use.rs
diff --git a/src/comp/middle/capture.rs b/src/rustc/middle/capture.rs
similarity index 100%
rename from src/comp/middle/capture.rs
rename to src/rustc/middle/capture.rs
diff --git a/src/comp/middle/check_alt.rs b/src/rustc/middle/check_alt.rs
similarity index 100%
rename from src/comp/middle/check_alt.rs
rename to src/rustc/middle/check_alt.rs
diff --git a/src/comp/middle/check_const.rs b/src/rustc/middle/check_const.rs
similarity index 100%
rename from src/comp/middle/check_const.rs
rename to src/rustc/middle/check_const.rs
diff --git a/src/comp/middle/fn_usage.rs b/src/rustc/middle/fn_usage.rs
similarity index 100%
rename from src/comp/middle/fn_usage.rs
rename to src/rustc/middle/fn_usage.rs
diff --git a/src/comp/middle/freevars.rs b/src/rustc/middle/freevars.rs
similarity index 100%
rename from src/comp/middle/freevars.rs
rename to src/rustc/middle/freevars.rs
diff --git a/src/comp/middle/inline.rs b/src/rustc/middle/inline.rs
similarity index 100%
rename from src/comp/middle/inline.rs
rename to src/rustc/middle/inline.rs
diff --git a/src/comp/middle/kind.rs b/src/rustc/middle/kind.rs
similarity index 100%
rename from src/comp/middle/kind.rs
rename to src/rustc/middle/kind.rs
diff --git a/src/comp/middle/last_use.rs b/src/rustc/middle/last_use.rs
similarity index 100%
rename from src/comp/middle/last_use.rs
rename to src/rustc/middle/last_use.rs
diff --git a/src/comp/middle/lint.rs b/src/rustc/middle/lint.rs
similarity index 100%
rename from src/comp/middle/lint.rs
rename to src/rustc/middle/lint.rs
diff --git a/src/comp/middle/mutbl.rs b/src/rustc/middle/mutbl.rs
similarity index 100%
rename from src/comp/middle/mutbl.rs
rename to src/rustc/middle/mutbl.rs
diff --git a/src/comp/middle/pat_util.rs b/src/rustc/middle/pat_util.rs
similarity index 100%
rename from src/comp/middle/pat_util.rs
rename to src/rustc/middle/pat_util.rs
diff --git a/src/comp/middle/resolve.rs b/src/rustc/middle/resolve.rs
similarity index 100%
rename from src/comp/middle/resolve.rs
rename to src/rustc/middle/resolve.rs
diff --git a/src/comp/middle/trans/alt.rs b/src/rustc/middle/trans/alt.rs
similarity index 100%
rename from src/comp/middle/trans/alt.rs
rename to src/rustc/middle/trans/alt.rs
diff --git a/src/comp/middle/trans/base.rs b/src/rustc/middle/trans/base.rs
similarity index 100%
rename from src/comp/middle/trans/base.rs
rename to src/rustc/middle/trans/base.rs
diff --git a/src/comp/middle/trans/build.rs b/src/rustc/middle/trans/build.rs
similarity index 100%
rename from src/comp/middle/trans/build.rs
rename to src/rustc/middle/trans/build.rs
diff --git a/src/comp/middle/trans/closure.rs b/src/rustc/middle/trans/closure.rs
similarity index 100%
rename from src/comp/middle/trans/closure.rs
rename to src/rustc/middle/trans/closure.rs
diff --git a/src/comp/middle/trans/common.rs b/src/rustc/middle/trans/common.rs
similarity index 100%
rename from src/comp/middle/trans/common.rs
rename to src/rustc/middle/trans/common.rs
diff --git a/src/comp/middle/trans/debuginfo.rs b/src/rustc/middle/trans/debuginfo.rs
similarity index 100%
rename from src/comp/middle/trans/debuginfo.rs
rename to src/rustc/middle/trans/debuginfo.rs
diff --git a/src/comp/middle/trans/impl.rs b/src/rustc/middle/trans/impl.rs
similarity index 100%
rename from src/comp/middle/trans/impl.rs
rename to src/rustc/middle/trans/impl.rs
diff --git a/src/comp/middle/trans/native.rs b/src/rustc/middle/trans/native.rs
similarity index 100%
rename from src/comp/middle/trans/native.rs
rename to src/rustc/middle/trans/native.rs
diff --git a/src/comp/middle/trans/shape.rs b/src/rustc/middle/trans/shape.rs
similarity index 100%
rename from src/comp/middle/trans/shape.rs
rename to src/rustc/middle/trans/shape.rs
diff --git a/src/comp/middle/trans/tvec.rs b/src/rustc/middle/trans/tvec.rs
similarity index 100%
rename from src/comp/middle/trans/tvec.rs
rename to src/rustc/middle/trans/tvec.rs
diff --git a/src/comp/middle/trans/type_of.rs b/src/rustc/middle/trans/type_of.rs
similarity index 100%
rename from src/comp/middle/trans/type_of.rs
rename to src/rustc/middle/trans/type_of.rs
diff --git a/src/comp/middle/trans/uniq.rs b/src/rustc/middle/trans/uniq.rs
similarity index 100%
rename from src/comp/middle/trans/uniq.rs
rename to src/rustc/middle/trans/uniq.rs
diff --git a/src/comp/middle/tstate/ann.rs b/src/rustc/middle/tstate/ann.rs
similarity index 100%
rename from src/comp/middle/tstate/ann.rs
rename to src/rustc/middle/tstate/ann.rs
diff --git a/src/comp/middle/tstate/annotate.rs b/src/rustc/middle/tstate/annotate.rs
similarity index 100%
rename from src/comp/middle/tstate/annotate.rs
rename to src/rustc/middle/tstate/annotate.rs
diff --git a/src/comp/middle/tstate/auxiliary.rs b/src/rustc/middle/tstate/auxiliary.rs
similarity index 100%
rename from src/comp/middle/tstate/auxiliary.rs
rename to src/rustc/middle/tstate/auxiliary.rs
diff --git a/src/comp/middle/tstate/bitvectors.rs b/src/rustc/middle/tstate/bitvectors.rs
similarity index 100%
rename from src/comp/middle/tstate/bitvectors.rs
rename to src/rustc/middle/tstate/bitvectors.rs
diff --git a/src/comp/middle/tstate/ck.rs b/src/rustc/middle/tstate/ck.rs
similarity index 100%
rename from src/comp/middle/tstate/ck.rs
rename to src/rustc/middle/tstate/ck.rs
diff --git a/src/comp/middle/tstate/collect_locals.rs b/src/rustc/middle/tstate/collect_locals.rs
similarity index 100%
rename from src/comp/middle/tstate/collect_locals.rs
rename to 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
similarity index 100%
rename from src/comp/middle/tstate/pre_post_conditions.rs
rename to src/rustc/middle/tstate/pre_post_conditions.rs
diff --git a/src/comp/middle/tstate/states.rs b/src/rustc/middle/tstate/states.rs
similarity index 100%
rename from src/comp/middle/tstate/states.rs
rename to src/rustc/middle/tstate/states.rs
diff --git a/src/comp/middle/tstate/tritv.rs b/src/rustc/middle/tstate/tritv.rs
similarity index 100%
rename from src/comp/middle/tstate/tritv.rs
rename to src/rustc/middle/tstate/tritv.rs
diff --git a/src/comp/middle/ty.rs b/src/rustc/middle/ty.rs
similarity index 100%
rename from src/comp/middle/ty.rs
rename to src/rustc/middle/ty.rs
diff --git a/src/comp/middle/typeck.rs b/src/rustc/middle/typeck.rs
similarity index 100%
rename from src/comp/middle/typeck.rs
rename to src/rustc/middle/typeck.rs
diff --git a/src/comp/rustc.rc b/src/rustc/rustc.rc
similarity index 100%
rename from src/comp/rustc.rc
rename to src/rustc/rustc.rc
diff --git a/src/comp/syntax/ast.rs b/src/rustc/syntax/ast.rs
similarity index 100%
rename from src/comp/syntax/ast.rs
rename to src/rustc/syntax/ast.rs
diff --git a/src/comp/syntax/ast_util.rs b/src/rustc/syntax/ast_util.rs
similarity index 100%
rename from src/comp/syntax/ast_util.rs
rename to src/rustc/syntax/ast_util.rs
diff --git a/src/comp/syntax/codemap.rs b/src/rustc/syntax/codemap.rs
similarity index 100%
rename from src/comp/syntax/codemap.rs
rename to src/rustc/syntax/codemap.rs
diff --git a/src/comp/syntax/ext/base.rs b/src/rustc/syntax/ext/base.rs
similarity index 100%
rename from src/comp/syntax/ext/base.rs
rename to src/rustc/syntax/ext/base.rs
diff --git a/src/comp/syntax/ext/build.rs b/src/rustc/syntax/ext/build.rs
similarity index 100%
rename from src/comp/syntax/ext/build.rs
rename to src/rustc/syntax/ext/build.rs
diff --git a/src/comp/syntax/ext/concat_idents.rs b/src/rustc/syntax/ext/concat_idents.rs
similarity index 100%
rename from src/comp/syntax/ext/concat_idents.rs
rename to src/rustc/syntax/ext/concat_idents.rs
diff --git a/src/comp/syntax/ext/env.rs b/src/rustc/syntax/ext/env.rs
similarity index 100%
rename from src/comp/syntax/ext/env.rs
rename to src/rustc/syntax/ext/env.rs
diff --git a/src/comp/syntax/ext/expand.rs b/src/rustc/syntax/ext/expand.rs
similarity index 100%
rename from src/comp/syntax/ext/expand.rs
rename to src/rustc/syntax/ext/expand.rs
diff --git a/src/comp/syntax/ext/fmt.rs b/src/rustc/syntax/ext/fmt.rs
similarity index 100%
rename from src/comp/syntax/ext/fmt.rs
rename to 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
similarity index 100%
rename from src/comp/syntax/ext/ident_to_str.rs
rename to 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
similarity index 100%
rename from src/comp/syntax/ext/log_syntax.rs
rename to src/rustc/syntax/ext/log_syntax.rs
diff --git a/src/comp/syntax/ext/qquote.rs b/src/rustc/syntax/ext/qquote.rs
similarity index 100%
rename from src/comp/syntax/ext/qquote.rs
rename to src/rustc/syntax/ext/qquote.rs
diff --git a/src/comp/syntax/ext/simplext.rs b/src/rustc/syntax/ext/simplext.rs
similarity index 100%
rename from src/comp/syntax/ext/simplext.rs
rename to src/rustc/syntax/ext/simplext.rs
diff --git a/src/comp/syntax/fold.rs b/src/rustc/syntax/fold.rs
similarity index 100%
rename from src/comp/syntax/fold.rs
rename to src/rustc/syntax/fold.rs
diff --git a/src/comp/syntax/parse/eval.rs b/src/rustc/syntax/parse/eval.rs
similarity index 100%
rename from src/comp/syntax/parse/eval.rs
rename to src/rustc/syntax/parse/eval.rs
diff --git a/src/comp/syntax/parse/lexer.rs b/src/rustc/syntax/parse/lexer.rs
similarity index 100%
rename from src/comp/syntax/parse/lexer.rs
rename to src/rustc/syntax/parse/lexer.rs
diff --git a/src/comp/syntax/parse/parser.rs b/src/rustc/syntax/parse/parser.rs
similarity index 100%
rename from src/comp/syntax/parse/parser.rs
rename to src/rustc/syntax/parse/parser.rs
diff --git a/src/comp/syntax/parse/token.rs b/src/rustc/syntax/parse/token.rs
similarity index 100%
rename from src/comp/syntax/parse/token.rs
rename to src/rustc/syntax/parse/token.rs
diff --git a/src/comp/syntax/print/pp.rs b/src/rustc/syntax/print/pp.rs
similarity index 100%
rename from src/comp/syntax/print/pp.rs
rename to src/rustc/syntax/print/pp.rs
diff --git a/src/comp/syntax/print/pprust.rs b/src/rustc/syntax/print/pprust.rs
similarity index 100%
rename from src/comp/syntax/print/pprust.rs
rename to src/rustc/syntax/print/pprust.rs
diff --git a/src/comp/syntax/util/interner.rs b/src/rustc/syntax/util/interner.rs
similarity index 100%
rename from src/comp/syntax/util/interner.rs
rename to src/rustc/syntax/util/interner.rs
diff --git a/src/comp/syntax/visit.rs b/src/rustc/syntax/visit.rs
similarity index 100%
rename from src/comp/syntax/visit.rs
rename to src/rustc/syntax/visit.rs
diff --git a/src/comp/util/common.rs b/src/rustc/util/common.rs
similarity index 100%
rename from src/comp/util/common.rs
rename to src/rustc/util/common.rs
diff --git a/src/comp/util/filesearch.rs b/src/rustc/util/filesearch.rs
similarity index 100%
rename from src/comp/util/filesearch.rs
rename to src/rustc/util/filesearch.rs
diff --git a/src/comp/util/ppaux.rs b/src/rustc/util/ppaux.rs
similarity index 100%
rename from src/comp/util/ppaux.rs
rename to src/rustc/util/ppaux.rs