Rename src/rustc to src/librustc. Use the driver crate

BlissfulEscape · Nov 7, 2012 · 69a8b4d · 69a8b4d
1 parent f72ef31
commit 69a8b4d
Show file tree

Hide file tree

Showing 112 changed files with 28 additions and 36 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -216,16 +216,15 @@ STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/libstd/,          \
 # rustc crate variables
 ######################################################################
 
-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 */*/*/*.rs)))
+COMPILER_CRATE := $(S)src/librustc/rustc.rc
+COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/librustc/,      \
+                           rustc.rc *.rs */*.rs */*/*.rs */*/*/*.rs))
 
 LIBSYNTAX_CRATE := $(S)src/libsyntax/syntax.rc
 LIBSYNTAX_INPUTS := $(wildcard $(addprefix $(S)src/libsyntax/, \
                             syntax.rc *.rs */*.rs */*/*.rs))
 
-RUSTC_INPUTS := $(S)src/rustc/driver/rustc.rs
+DRIVER_CRATE := $(S)src/driver/driver.rs
 
 ######################################################################
 # LLVM macros

diff --git a/mk/target.mk b/mk/target.mk
@@ -24,22 +24,22 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM): \
 	@$$(call E, cp: $$@)
 	$$(Q)cp $$< $$@
 
-$$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X):				\
-		$$(RUSTC_INPUTS)                            \
-		$$(TLIBRUSTC_DEFAULT$(1)_T_$(2)_H_$(3))
-	@$$(call E, compile_and_link: $$@)
-	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$<
-ifdef CFG_ENABLE_PAX_FLAGS
-	@$$(call E, apply PaX flags: $$@)
-	@"$(CFG_PAXCTL)" -cm "$$@"
-endif
-
 $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC):		\
 		$$(COMPILER_CRATE) $$(COMPILER_INPUTS)		\
                 $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX)
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< && touch $$@
 
+$$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X):			\
+		$$(DRIVER_CRATE) 							\
+		$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC)
+	@$$(call E, compile_and_link: $$@)
+	$$(STAGE$(1)_T_$(2)_H_$(3)) --cfg rustc -o $$@ $$<
+ifdef CFG_ENABLE_PAX_FLAGS
+	@$$(call E, apply PaX flags: $$@)
+	@"$(CFG_PAXCTL)" -cm "$$@"
+endif
+
 $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX): \
                 $$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
 		$$(TSREQ$(1)_T_$(2)_H_$(3))			\

diff --git a/mk/tools.mk b/mk/tools.mk
@@ -1,8 +1,6 @@
 # Rules for non-core tools built with the compiler, both for target
 # and host architectures
 
-TOOL_DRIVER := $(S)src/driver/driver.rs
-
 FUZZER_LIB := $(S)src/libfuzzer/fuzzer.rc
 FUZZER_INPUTS := $(wildcard $(addprefix $(S)src/libfuzzer/, *.rs))
 
@@ -36,7 +34,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBFUZZER):          \
 	$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
 
 $$(TBIN$(1)_T_$(4)_H_$(3))/fuzzer$$(X):				\
-		$$(TOOL_DRIVER)								\
+		$$(DRIVER_CRATE)								\
 		$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBFUZZER)
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg fuzzer -o $$@ $$<
@@ -82,7 +80,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBCARGO):		\
 	$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
 
 $$(TBIN$(1)_T_$(4)_H_$(3))/cargo$$(X):				\
-		$$(TOOL_DRIVER) 							\
+		$$(DRIVER_CRATE) 							\
 		$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBCARGO)
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg cargo -o $$@ $$<
@@ -111,7 +109,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTDOC):		\
 	$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
 
 $$(TBIN$(1)_T_$(4)_H_$(3))/rustdoc$$(X):			\
-		$$(TOOL_DRIVER) 							\
+		$$(DRIVER_CRATE) 							\
 		$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTDOC)
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rustdoc -o $$@ $$<
@@ -140,7 +138,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTI):		\
 	$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
 
 $$(TBIN$(1)_T_$(4)_H_$(3))/rusti$$(X):			\
-		$$(TOOL_DRIVER) 							\
+		$$(DRIVER_CRATE) 							\
 		$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTI)
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(4)_H_$(3)) --cfg rusti -o $$@ $$<

diff --git a/src/driver/driver.rs b/src/driver/driver.rs
@@ -13,4 +13,7 @@ extern mod self(name = "rustdoc", vers = "0.5");
 #[cfg(rusti)]
 extern mod self(name = "rusti", vers = "0.5");
 
+#[cfg(rustc)]
+extern mod self(name = "rustc", vers = "0.5");
+
 fn main() { self::main() }
diff --git a/src/rustc/README.txt → src/librustc/README.txt b/src/rustc/README.txt → src/librustc/README.txt
diff --git a/src/rustc/back/abi.rs → src/librustc/back/abi.rs b/src/rustc/back/abi.rs → src/librustc/back/abi.rs
diff --git a/src/rustc/back/link.rs → src/librustc/back/link.rs b/src/rustc/back/link.rs → src/librustc/back/link.rs
diff --git a/src/rustc/back/rpath.rs → src/librustc/back/rpath.rs b/src/rustc/back/rpath.rs → src/librustc/back/rpath.rs
diff --git a/src/rustc/back/target_strs.rs → src/librustc/back/target_strs.rs b/src/rustc/back/target_strs.rs → src/librustc/back/target_strs.rs
diff --git a/src/rustc/back/upcall.rs → src/librustc/back/upcall.rs b/src/rustc/back/upcall.rs → src/librustc/back/upcall.rs
diff --git a/src/rustc/back/x86.rs → src/librustc/back/x86.rs b/src/rustc/back/x86.rs → src/librustc/back/x86.rs
diff --git a/src/rustc/back/x86_64.rs → src/librustc/back/x86_64.rs b/src/rustc/back/x86_64.rs → src/librustc/back/x86_64.rs
diff --git a/src/rustc/driver.rs → src/librustc/driver.rs b/src/rustc/driver.rs → src/librustc/driver.rs
diff --git a/src/rustc/driver/driver.rs → src/librustc/driver/driver.rs b/src/rustc/driver/driver.rs → src/librustc/driver/driver.rs
diff --git a/src/rustc/driver/session.rs → src/librustc/driver/session.rs b/src/rustc/driver/session.rs → src/librustc/driver/session.rs
diff --git a/src/rustc/front/config.rs → src/librustc/front/config.rs b/src/rustc/front/config.rs → src/librustc/front/config.rs
diff --git a/src/rustc/front/core_inject.rs → src/librustc/front/core_inject.rs b/src/rustc/front/core_inject.rs → src/librustc/front/core_inject.rs
diff --git a/src/rustc/front/intrinsic.rs → src/librustc/front/intrinsic.rs b/src/rustc/front/intrinsic.rs → src/librustc/front/intrinsic.rs
diff --git a/src/rustc/front/intrinsic_inject.rs → src/librustc/front/intrinsic_inject.rs b/src/rustc/front/intrinsic_inject.rs → src/librustc/front/intrinsic_inject.rs
diff --git a/src/rustc/front/test.rs → src/librustc/front/test.rs b/src/rustc/front/test.rs → src/librustc/front/test.rs
diff --git a/src/rustc/lib/llvm.rs → src/librustc/lib/llvm.rs b/src/rustc/lib/llvm.rs → src/librustc/lib/llvm.rs
diff --git a/src/rustc/metadata.rs → src/librustc/metadata.rs b/src/rustc/metadata.rs → src/librustc/metadata.rs
diff --git a/src/rustc/metadata/common.rs → src/librustc/metadata/common.rs b/src/rustc/metadata/common.rs → src/librustc/metadata/common.rs
diff --git a/src/rustc/metadata/creader.rs → src/librustc/metadata/creader.rs b/src/rustc/metadata/creader.rs → src/librustc/metadata/creader.rs
diff --git a/src/rustc/metadata/csearch.rs → src/librustc/metadata/csearch.rs b/src/rustc/metadata/csearch.rs → src/librustc/metadata/csearch.rs
diff --git a/src/rustc/metadata/cstore.rs → src/librustc/metadata/cstore.rs b/src/rustc/metadata/cstore.rs → src/librustc/metadata/cstore.rs
diff --git a/src/rustc/metadata/decoder.rs → src/librustc/metadata/decoder.rs b/src/rustc/metadata/decoder.rs → src/librustc/metadata/decoder.rs
diff --git a/src/rustc/metadata/encoder.rs → src/librustc/metadata/encoder.rs b/src/rustc/metadata/encoder.rs → src/librustc/metadata/encoder.rs
diff --git a/src/rustc/metadata/filesearch.rs → src/librustc/metadata/filesearch.rs b/src/rustc/metadata/filesearch.rs → src/librustc/metadata/filesearch.rs
diff --git a/src/rustc/metadata/loader.rs → src/librustc/metadata/loader.rs b/src/rustc/metadata/loader.rs → src/librustc/metadata/loader.rs
diff --git a/src/rustc/metadata/tydecode.rs → src/librustc/metadata/tydecode.rs b/src/rustc/metadata/tydecode.rs → src/librustc/metadata/tydecode.rs
diff --git a/src/rustc/metadata/tyencode.rs → src/librustc/metadata/tyencode.rs b/src/rustc/metadata/tyencode.rs → src/librustc/metadata/tyencode.rs
diff --git a/src/rustc/middle/astencode.rs → src/librustc/middle/astencode.rs b/src/rustc/middle/astencode.rs → src/librustc/middle/astencode.rs
diff --git a/src/rustc/middle/borrowck.rs → src/librustc/middle/borrowck.rs b/src/rustc/middle/borrowck.rs → src/librustc/middle/borrowck.rs
diff --git a/src/rustc/middle/borrowck/check_loans.rs → src/librustc/middle/borrowck/check_loans.rs b/src/rustc/middle/borrowck/check_loans.rs → src/librustc/middle/borrowck/check_loans.rs
diff --git a/src/rustc/middle/borrowck/gather_loans.rs → src/librustc/middle/borrowck/gather_loans.rs b/src/rustc/middle/borrowck/gather_loans.rs → src/librustc/middle/borrowck/gather_loans.rs
diff --git a/src/rustc/middle/borrowck/loan.rs → src/librustc/middle/borrowck/loan.rs b/src/rustc/middle/borrowck/loan.rs → src/librustc/middle/borrowck/loan.rs
diff --git a/src/rustc/middle/borrowck/preserve.rs → src/librustc/middle/borrowck/preserve.rs b/src/rustc/middle/borrowck/preserve.rs → src/librustc/middle/borrowck/preserve.rs
diff --git a/src/rustc/middle/capture.rs → src/librustc/middle/capture.rs b/src/rustc/middle/capture.rs → src/librustc/middle/capture.rs
diff --git a/src/rustc/middle/check_alt.rs → src/librustc/middle/check_alt.rs b/src/rustc/middle/check_alt.rs → src/librustc/middle/check_alt.rs
diff --git a/src/rustc/middle/check_const.rs → src/librustc/middle/check_const.rs b/src/rustc/middle/check_const.rs → src/librustc/middle/check_const.rs
diff --git a/src/rustc/middle/check_loop.rs → src/librustc/middle/check_loop.rs b/src/rustc/middle/check_loop.rs → src/librustc/middle/check_loop.rs
diff --git a/src/rustc/middle/const_eval.rs → src/librustc/middle/const_eval.rs b/src/rustc/middle/const_eval.rs → src/librustc/middle/const_eval.rs
diff --git a/src/rustc/middle/freevars.rs → src/librustc/middle/freevars.rs b/src/rustc/middle/freevars.rs → src/librustc/middle/freevars.rs
diff --git a/src/rustc/middle/kind.rs → src/librustc/middle/kind.rs b/src/rustc/middle/kind.rs → src/librustc/middle/kind.rs
diff --git a/src/rustc/middle/lang_items.rs → src/librustc/middle/lang_items.rs b/src/rustc/middle/lang_items.rs → src/librustc/middle/lang_items.rs
diff --git a/src/rustc/middle/lint.rs → src/librustc/middle/lint.rs b/src/rustc/middle/lint.rs → src/librustc/middle/lint.rs
diff --git a/src/rustc/middle/liveness.rs → src/librustc/middle/liveness.rs b/src/rustc/middle/liveness.rs → src/librustc/middle/liveness.rs
diff --git a/src/rustc/middle/mem_categorization.rs → src/librustc/middle/mem_categorization.rs b/src/rustc/middle/mem_categorization.rs → src/librustc/middle/mem_categorization.rs
diff --git a/src/rustc/middle/pat_util.rs → src/librustc/middle/pat_util.rs b/src/rustc/middle/pat_util.rs → src/librustc/middle/pat_util.rs
diff --git a/src/rustc/middle/privacy.rs → src/librustc/middle/privacy.rs b/src/rustc/middle/privacy.rs → src/librustc/middle/privacy.rs
diff --git a/src/rustc/middle/region.rs → src/librustc/middle/region.rs b/src/rustc/middle/region.rs → src/librustc/middle/region.rs
diff --git a/src/rustc/middle/resolve.rs → src/librustc/middle/resolve.rs b/src/rustc/middle/resolve.rs → src/librustc/middle/resolve.rs
diff --git a/src/rustc/middle/trans/alt.rs → src/librustc/middle/trans/alt.rs b/src/rustc/middle/trans/alt.rs → src/librustc/middle/trans/alt.rs
diff --git a/src/rustc/middle/trans/base.rs → src/librustc/middle/trans/base.rs b/src/rustc/middle/trans/base.rs → src/librustc/middle/trans/base.rs
diff --git a/src/rustc/middle/trans/block.rs → src/librustc/middle/trans/block.rs b/src/rustc/middle/trans/block.rs → src/librustc/middle/trans/block.rs
diff --git a/src/rustc/middle/trans/build.rs → src/librustc/middle/trans/build.rs b/src/rustc/middle/trans/build.rs → src/librustc/middle/trans/build.rs
diff --git a/src/rustc/middle/trans/callee.rs → src/librustc/middle/trans/callee.rs b/src/rustc/middle/trans/callee.rs → src/librustc/middle/trans/callee.rs
diff --git a/src/rustc/middle/trans/closure.rs → src/librustc/middle/trans/closure.rs b/src/rustc/middle/trans/closure.rs → src/librustc/middle/trans/closure.rs
diff --git a/src/rustc/middle/trans/common.rs → src/librustc/middle/trans/common.rs b/src/rustc/middle/trans/common.rs → src/librustc/middle/trans/common.rs
diff --git a/src/rustc/middle/trans/consts.rs → src/librustc/middle/trans/consts.rs b/src/rustc/middle/trans/consts.rs → src/librustc/middle/trans/consts.rs
diff --git a/src/rustc/middle/trans/controlflow.rs → src/librustc/middle/trans/controlflow.rs b/src/rustc/middle/trans/controlflow.rs → src/librustc/middle/trans/controlflow.rs
diff --git a/src/rustc/middle/trans/datum.rs → src/librustc/middle/trans/datum.rs b/src/rustc/middle/trans/datum.rs → src/librustc/middle/trans/datum.rs
diff --git a/src/rustc/middle/trans/debuginfo.rs → src/librustc/middle/trans/debuginfo.rs b/src/rustc/middle/trans/debuginfo.rs → src/librustc/middle/trans/debuginfo.rs
diff --git a/src/rustc/middle/trans/deriving.rs → src/librustc/middle/trans/deriving.rs b/src/rustc/middle/trans/deriving.rs → src/librustc/middle/trans/deriving.rs
diff --git a/src/rustc/middle/trans/expr.rs → src/librustc/middle/trans/expr.rs b/src/rustc/middle/trans/expr.rs → src/librustc/middle/trans/expr.rs
diff --git a/src/rustc/middle/trans/foreign.rs → src/librustc/middle/trans/foreign.rs b/src/rustc/middle/trans/foreign.rs → src/librustc/middle/trans/foreign.rs
diff --git a/src/rustc/middle/trans/glue.rs → src/librustc/middle/trans/glue.rs b/src/rustc/middle/trans/glue.rs → src/librustc/middle/trans/glue.rs
diff --git a/src/rustc/middle/trans/inline.rs → src/librustc/middle/trans/inline.rs b/src/rustc/middle/trans/inline.rs → src/librustc/middle/trans/inline.rs
diff --git a/src/rustc/middle/trans/machine.rs → src/librustc/middle/trans/machine.rs b/src/rustc/middle/trans/machine.rs → src/librustc/middle/trans/machine.rs
diff --git a/src/rustc/middle/trans/macros.rs → src/librustc/middle/trans/macros.rs b/src/rustc/middle/trans/macros.rs → src/librustc/middle/trans/macros.rs
diff --git a/src/rustc/middle/trans/meth.rs → src/librustc/middle/trans/meth.rs b/src/rustc/middle/trans/meth.rs → src/librustc/middle/trans/meth.rs
diff --git a/src/rustc/middle/trans/monomorphize.rs → src/librustc/middle/trans/monomorphize.rs b/src/rustc/middle/trans/monomorphize.rs → src/librustc/middle/trans/monomorphize.rs
diff --git a/src/rustc/middle/trans/reachable.rs → src/librustc/middle/trans/reachable.rs b/src/rustc/middle/trans/reachable.rs → src/librustc/middle/trans/reachable.rs
diff --git a/src/rustc/middle/trans/reflect.rs → src/librustc/middle/trans/reflect.rs b/src/rustc/middle/trans/reflect.rs → src/librustc/middle/trans/reflect.rs
diff --git a/src/rustc/middle/trans/shape.rs → src/librustc/middle/trans/shape.rs b/src/rustc/middle/trans/shape.rs → src/librustc/middle/trans/shape.rs
diff --git a/src/rustc/middle/trans/tvec.rs → src/librustc/middle/trans/tvec.rs b/src/rustc/middle/trans/tvec.rs → src/librustc/middle/trans/tvec.rs
diff --git a/src/rustc/middle/trans/type_of.rs → src/librustc/middle/trans/type_of.rs b/src/rustc/middle/trans/type_of.rs → src/librustc/middle/trans/type_of.rs
diff --git a/src/rustc/middle/trans/type_use.rs → src/librustc/middle/trans/type_use.rs b/src/rustc/middle/trans/type_use.rs → src/librustc/middle/trans/type_use.rs
diff --git a/src/rustc/middle/trans/uniq.rs → src/librustc/middle/trans/uniq.rs b/src/rustc/middle/trans/uniq.rs → src/librustc/middle/trans/uniq.rs
diff --git a/src/rustc/middle/ty.rs → src/librustc/middle/ty.rs b/src/rustc/middle/ty.rs → src/librustc/middle/ty.rs
diff --git a/src/rustc/middle/typeck.rs → src/librustc/middle/typeck.rs b/src/rustc/middle/typeck.rs → src/librustc/middle/typeck.rs
diff --git a/src/rustc/middle/typeck/astconv.rs → src/librustc/middle/typeck/astconv.rs b/src/rustc/middle/typeck/astconv.rs → src/librustc/middle/typeck/astconv.rs
diff --git a/src/rustc/middle/typeck/check.rs → src/librustc/middle/typeck/check.rs b/src/rustc/middle/typeck/check.rs → src/librustc/middle/typeck/check.rs
diff --git a/src/rustc/middle/typeck/check/alt.rs → src/librustc/middle/typeck/check/alt.rs b/src/rustc/middle/typeck/check/alt.rs → src/librustc/middle/typeck/check/alt.rs
diff --git a/src/rustc/middle/typeck/check/demand.rs → src/librustc/middle/typeck/check/demand.rs b/src/rustc/middle/typeck/check/demand.rs → src/librustc/middle/typeck/check/demand.rs
diff --git a/src/rustc/middle/typeck/check/method.rs → src/librustc/middle/typeck/check/method.rs b/src/rustc/middle/typeck/check/method.rs → src/librustc/middle/typeck/check/method.rs
diff --git a/src/rustc/middle/typeck/check/regionck.rs → src/librustc/middle/typeck/check/regionck.rs b/src/rustc/middle/typeck/check/regionck.rs → src/librustc/middle/typeck/check/regionck.rs
diff --git a/src/rustc/middle/typeck/check/regionmanip.rs → ...brustc/middle/typeck/check/regionmanip.rs b/src/rustc/middle/typeck/check/regionmanip.rs → ...brustc/middle/typeck/check/regionmanip.rs
diff --git a/src/rustc/middle/typeck/check/vtable.rs → src/librustc/middle/typeck/check/vtable.rs b/src/rustc/middle/typeck/check/vtable.rs → src/librustc/middle/typeck/check/vtable.rs
diff --git a/src/rustc/middle/typeck/check/writeback.rs → ...librustc/middle/typeck/check/writeback.rs b/src/rustc/middle/typeck/check/writeback.rs → ...librustc/middle/typeck/check/writeback.rs
diff --git a/src/rustc/middle/typeck/coherence.rs → src/librustc/middle/typeck/coherence.rs b/src/rustc/middle/typeck/coherence.rs → src/librustc/middle/typeck/coherence.rs
diff --git a/src/rustc/middle/typeck/collect.rs → src/librustc/middle/typeck/collect.rs b/src/rustc/middle/typeck/collect.rs → src/librustc/middle/typeck/collect.rs
diff --git a/src/rustc/middle/typeck/deriving.rs → src/librustc/middle/typeck/deriving.rs b/src/rustc/middle/typeck/deriving.rs → src/librustc/middle/typeck/deriving.rs
diff --git a/src/rustc/middle/typeck/infer.rs → src/librustc/middle/typeck/infer.rs b/src/rustc/middle/typeck/infer.rs → src/librustc/middle/typeck/infer.rs
diff --git a/src/rustc/middle/typeck/infer/assignment.rs → ...ibrustc/middle/typeck/infer/assignment.rs b/src/rustc/middle/typeck/infer/assignment.rs → ...ibrustc/middle/typeck/infer/assignment.rs
diff --git a/src/rustc/middle/typeck/infer/combine.rs → src/librustc/middle/typeck/infer/combine.rs b/src/rustc/middle/typeck/infer/combine.rs → src/librustc/middle/typeck/infer/combine.rs
diff --git a/src/rustc/middle/typeck/infer/glb.rs → src/librustc/middle/typeck/infer/glb.rs b/src/rustc/middle/typeck/infer/glb.rs → src/librustc/middle/typeck/infer/glb.rs
diff --git a/src/rustc/middle/typeck/infer/integral.rs → src/librustc/middle/typeck/infer/integral.rs b/src/rustc/middle/typeck/infer/integral.rs → src/librustc/middle/typeck/infer/integral.rs
diff --git a/src/rustc/middle/typeck/infer/lattice.rs → src/librustc/middle/typeck/infer/lattice.rs b/src/rustc/middle/typeck/infer/lattice.rs → src/librustc/middle/typeck/infer/lattice.rs
diff --git a/src/rustc/middle/typeck/infer/lub.rs → src/librustc/middle/typeck/infer/lub.rs b/src/rustc/middle/typeck/infer/lub.rs → src/librustc/middle/typeck/infer/lub.rs
diff --git a/src/rustc/middle/typeck/infer/macros.rs → src/librustc/middle/typeck/infer/macros.rs b/src/rustc/middle/typeck/infer/macros.rs → src/librustc/middle/typeck/infer/macros.rs
diff --git a/...c/middle/typeck/infer/region_inference.rs → ...c/middle/typeck/infer/region_inference.rs b/...c/middle/typeck/infer/region_inference.rs → ...c/middle/typeck/infer/region_inference.rs
diff --git a/src/rustc/middle/typeck/infer/resolve.rs → src/librustc/middle/typeck/infer/resolve.rs b/src/rustc/middle/typeck/infer/resolve.rs → src/librustc/middle/typeck/infer/resolve.rs
diff --git a/src/rustc/middle/typeck/infer/sub.rs → src/librustc/middle/typeck/infer/sub.rs b/src/rustc/middle/typeck/infer/sub.rs → src/librustc/middle/typeck/infer/sub.rs
diff --git a/src/rustc/middle/typeck/infer/to_str.rs → src/librustc/middle/typeck/infer/to_str.rs b/src/rustc/middle/typeck/infer/to_str.rs → src/librustc/middle/typeck/infer/to_str.rs
diff --git a/src/rustc/middle/typeck/infer/unify.rs → src/librustc/middle/typeck/infer/unify.rs b/src/rustc/middle/typeck/infer/unify.rs → src/librustc/middle/typeck/infer/unify.rs
diff --git a/src/rustc/middle/typeck/rscope.rs → src/librustc/middle/typeck/rscope.rs b/src/rustc/middle/typeck/rscope.rs → src/librustc/middle/typeck/rscope.rs
diff --git a/src/rustc/rustc.rc → src/librustc/rustc.rc b/src/rustc/rustc.rc → src/librustc/rustc.rc
diff --git a/src/rustc/driver/rustc.rs → src/librustc/rustc.rs b/src/rustc/driver/rustc.rs → src/librustc/rustc.rs
@@ -1,27 +1,19 @@
-#[no_core];
-#[allow(vecs_implicitly_copyable)];
-#[allow(non_camel_case_types)];
-#[legacy_modes];
-
-extern mod core(vers = "0.5");
-extern mod std(vers = "0.5");
-extern mod rustc(vers = "0.5");
-extern mod syntax(vers = "0.5");
-
-use core::*;
-
 // -*- rust -*-
 use result::{Ok, Err};
 use io::ReaderUtil;
 use std::getopts;
 use std::map::HashMap;
 use getopts::{opt_present};
 use getopts::groups;
-use rustc::driver::driver::*;
 use syntax::codemap;
 use syntax::diagnostic;
-use rustc::driver::session;
-use rustc::middle::lint;
+use driver::driver::{host_triple, optgroups, early_error,
+                     str_input, file_input, build_session_options,
+                     build_session, build_configuration, parse_pretty,
+                     pp_mode, pretty_print_input, list_metadata,
+                     compile_input};
+use driver::session;
+use middle::lint;
 
 fn version(argv0: &str) {
     let mut vers = ~"unknown version";

diff --git a/src/rustc/util/common.rs → src/librustc/util/common.rs b/src/rustc/util/common.rs → src/librustc/util/common.rs
diff --git a/src/rustc/util/ppaux.rs → src/librustc/util/ppaux.rs b/src/rustc/util/ppaux.rs → src/librustc/util/ppaux.rs