diff --git a/Makefile.in b/Makefile.in index c1249f07ca215ec852bf9fb9333136ff140a3f67..65a136bceb478edc5b4d06cd1905158c45f575da 100644 --- 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 index 093bb136bc341d9e6b156c3251b90eca7d18193b..c3995dbd23351e8710cab31d27114ba8162fcb2c 100644 --- 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 index 7d23c565918786bb4fdb2d34eec1ee48bbf90987..93f794be29da74377f90c881549466171f273849 100644 --- 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 index 4689971eec041cf7b4250637fa388a1e00b44c6f..49143ddc97d4f76673715721e23a2ace1bc6c9c4 100644 --- a/src/driver/driver.rs +++ b/src/driver/driver.rs @@ -13,4 +13,7 @@ #[cfg(rusti)] extern mod self(name = "rusti", vers = "0.5"); +#[cfg(rustc)] +extern mod self(name = "rustc", vers = "0.5"); + fn main() { self::main() } \ No newline at end of file diff --git a/src/rustc/README.txt b/src/librustc/README.txt similarity index 100% rename from src/rustc/README.txt rename to src/librustc/README.txt diff --git a/src/rustc/back/abi.rs b/src/librustc/back/abi.rs similarity index 100% rename from src/rustc/back/abi.rs rename to src/librustc/back/abi.rs diff --git a/src/rustc/back/link.rs b/src/librustc/back/link.rs similarity index 100% rename from src/rustc/back/link.rs rename to src/librustc/back/link.rs diff --git a/src/rustc/back/rpath.rs b/src/librustc/back/rpath.rs similarity index 100% rename from src/rustc/back/rpath.rs rename to src/librustc/back/rpath.rs diff --git a/src/rustc/back/target_strs.rs b/src/librustc/back/target_strs.rs similarity index 100% rename from src/rustc/back/target_strs.rs rename to src/librustc/back/target_strs.rs diff --git a/src/rustc/back/upcall.rs b/src/librustc/back/upcall.rs similarity index 100% rename from src/rustc/back/upcall.rs rename to src/librustc/back/upcall.rs diff --git a/src/rustc/back/x86.rs b/src/librustc/back/x86.rs similarity index 100% rename from src/rustc/back/x86.rs rename to src/librustc/back/x86.rs diff --git a/src/rustc/back/x86_64.rs b/src/librustc/back/x86_64.rs similarity index 100% rename from src/rustc/back/x86_64.rs rename to src/librustc/back/x86_64.rs diff --git a/src/rustc/driver.rs b/src/librustc/driver.rs similarity index 100% rename from src/rustc/driver.rs rename to src/librustc/driver.rs diff --git a/src/rustc/driver/driver.rs b/src/librustc/driver/driver.rs similarity index 100% rename from src/rustc/driver/driver.rs rename to src/librustc/driver/driver.rs diff --git a/src/rustc/driver/session.rs b/src/librustc/driver/session.rs similarity index 100% rename from src/rustc/driver/session.rs rename to src/librustc/driver/session.rs diff --git a/src/rustc/front/config.rs b/src/librustc/front/config.rs similarity index 100% rename from src/rustc/front/config.rs rename to src/librustc/front/config.rs diff --git a/src/rustc/front/core_inject.rs b/src/librustc/front/core_inject.rs similarity index 100% rename from src/rustc/front/core_inject.rs rename to src/librustc/front/core_inject.rs diff --git a/src/rustc/front/intrinsic.rs b/src/librustc/front/intrinsic.rs similarity index 100% rename from src/rustc/front/intrinsic.rs rename to src/librustc/front/intrinsic.rs diff --git a/src/rustc/front/intrinsic_inject.rs b/src/librustc/front/intrinsic_inject.rs similarity index 100% rename from src/rustc/front/intrinsic_inject.rs rename to src/librustc/front/intrinsic_inject.rs diff --git a/src/rustc/front/test.rs b/src/librustc/front/test.rs similarity index 100% rename from src/rustc/front/test.rs rename to src/librustc/front/test.rs diff --git a/src/rustc/lib/llvm.rs b/src/librustc/lib/llvm.rs similarity index 100% rename from src/rustc/lib/llvm.rs rename to src/librustc/lib/llvm.rs diff --git a/src/rustc/metadata.rs b/src/librustc/metadata.rs similarity index 100% rename from src/rustc/metadata.rs rename to src/librustc/metadata.rs diff --git a/src/rustc/metadata/common.rs b/src/librustc/metadata/common.rs similarity index 100% rename from src/rustc/metadata/common.rs rename to src/librustc/metadata/common.rs diff --git a/src/rustc/metadata/creader.rs b/src/librustc/metadata/creader.rs similarity index 100% rename from src/rustc/metadata/creader.rs rename to src/librustc/metadata/creader.rs diff --git a/src/rustc/metadata/csearch.rs b/src/librustc/metadata/csearch.rs similarity index 100% rename from src/rustc/metadata/csearch.rs rename to src/librustc/metadata/csearch.rs diff --git a/src/rustc/metadata/cstore.rs b/src/librustc/metadata/cstore.rs similarity index 100% rename from src/rustc/metadata/cstore.rs rename to src/librustc/metadata/cstore.rs diff --git a/src/rustc/metadata/decoder.rs b/src/librustc/metadata/decoder.rs similarity index 100% rename from src/rustc/metadata/decoder.rs rename to src/librustc/metadata/decoder.rs diff --git a/src/rustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs similarity index 100% rename from src/rustc/metadata/encoder.rs rename to src/librustc/metadata/encoder.rs diff --git a/src/rustc/metadata/filesearch.rs b/src/librustc/metadata/filesearch.rs similarity index 100% rename from src/rustc/metadata/filesearch.rs rename to src/librustc/metadata/filesearch.rs diff --git a/src/rustc/metadata/loader.rs b/src/librustc/metadata/loader.rs similarity index 100% rename from src/rustc/metadata/loader.rs rename to src/librustc/metadata/loader.rs diff --git a/src/rustc/metadata/tydecode.rs b/src/librustc/metadata/tydecode.rs similarity index 100% rename from src/rustc/metadata/tydecode.rs rename to src/librustc/metadata/tydecode.rs diff --git a/src/rustc/metadata/tyencode.rs b/src/librustc/metadata/tyencode.rs similarity index 100% rename from src/rustc/metadata/tyencode.rs rename to src/librustc/metadata/tyencode.rs diff --git a/src/rustc/middle/astencode.rs b/src/librustc/middle/astencode.rs similarity index 100% rename from src/rustc/middle/astencode.rs rename to src/librustc/middle/astencode.rs diff --git a/src/rustc/middle/borrowck.rs b/src/librustc/middle/borrowck.rs similarity index 100% rename from src/rustc/middle/borrowck.rs rename to src/librustc/middle/borrowck.rs diff --git a/src/rustc/middle/borrowck/check_loans.rs b/src/librustc/middle/borrowck/check_loans.rs similarity index 100% rename from src/rustc/middle/borrowck/check_loans.rs rename to src/librustc/middle/borrowck/check_loans.rs diff --git a/src/rustc/middle/borrowck/gather_loans.rs b/src/librustc/middle/borrowck/gather_loans.rs similarity index 100% rename from src/rustc/middle/borrowck/gather_loans.rs rename to src/librustc/middle/borrowck/gather_loans.rs diff --git a/src/rustc/middle/borrowck/loan.rs b/src/librustc/middle/borrowck/loan.rs similarity index 100% rename from src/rustc/middle/borrowck/loan.rs rename to src/librustc/middle/borrowck/loan.rs diff --git a/src/rustc/middle/borrowck/preserve.rs b/src/librustc/middle/borrowck/preserve.rs similarity index 100% rename from src/rustc/middle/borrowck/preserve.rs rename to src/librustc/middle/borrowck/preserve.rs diff --git a/src/rustc/middle/capture.rs b/src/librustc/middle/capture.rs similarity index 100% rename from src/rustc/middle/capture.rs rename to src/librustc/middle/capture.rs diff --git a/src/rustc/middle/check_alt.rs b/src/librustc/middle/check_alt.rs similarity index 100% rename from src/rustc/middle/check_alt.rs rename to src/librustc/middle/check_alt.rs diff --git a/src/rustc/middle/check_const.rs b/src/librustc/middle/check_const.rs similarity index 100% rename from src/rustc/middle/check_const.rs rename to src/librustc/middle/check_const.rs diff --git a/src/rustc/middle/check_loop.rs b/src/librustc/middle/check_loop.rs similarity index 100% rename from src/rustc/middle/check_loop.rs rename to src/librustc/middle/check_loop.rs diff --git a/src/rustc/middle/const_eval.rs b/src/librustc/middle/const_eval.rs similarity index 100% rename from src/rustc/middle/const_eval.rs rename to src/librustc/middle/const_eval.rs diff --git a/src/rustc/middle/freevars.rs b/src/librustc/middle/freevars.rs similarity index 100% rename from src/rustc/middle/freevars.rs rename to src/librustc/middle/freevars.rs diff --git a/src/rustc/middle/kind.rs b/src/librustc/middle/kind.rs similarity index 100% rename from src/rustc/middle/kind.rs rename to src/librustc/middle/kind.rs diff --git a/src/rustc/middle/lang_items.rs b/src/librustc/middle/lang_items.rs similarity index 100% rename from src/rustc/middle/lang_items.rs rename to src/librustc/middle/lang_items.rs diff --git a/src/rustc/middle/lint.rs b/src/librustc/middle/lint.rs similarity index 100% rename from src/rustc/middle/lint.rs rename to src/librustc/middle/lint.rs diff --git a/src/rustc/middle/liveness.rs b/src/librustc/middle/liveness.rs similarity index 100% rename from src/rustc/middle/liveness.rs rename to src/librustc/middle/liveness.rs diff --git a/src/rustc/middle/mem_categorization.rs b/src/librustc/middle/mem_categorization.rs similarity index 100% rename from src/rustc/middle/mem_categorization.rs rename to src/librustc/middle/mem_categorization.rs diff --git a/src/rustc/middle/pat_util.rs b/src/librustc/middle/pat_util.rs similarity index 100% rename from src/rustc/middle/pat_util.rs rename to src/librustc/middle/pat_util.rs diff --git a/src/rustc/middle/privacy.rs b/src/librustc/middle/privacy.rs similarity index 100% rename from src/rustc/middle/privacy.rs rename to src/librustc/middle/privacy.rs diff --git a/src/rustc/middle/region.rs b/src/librustc/middle/region.rs similarity index 100% rename from src/rustc/middle/region.rs rename to src/librustc/middle/region.rs diff --git a/src/rustc/middle/resolve.rs b/src/librustc/middle/resolve.rs similarity index 100% rename from src/rustc/middle/resolve.rs rename to src/librustc/middle/resolve.rs diff --git a/src/rustc/middle/trans/alt.rs b/src/librustc/middle/trans/alt.rs similarity index 100% rename from src/rustc/middle/trans/alt.rs rename to src/librustc/middle/trans/alt.rs diff --git a/src/rustc/middle/trans/base.rs b/src/librustc/middle/trans/base.rs similarity index 100% rename from src/rustc/middle/trans/base.rs rename to src/librustc/middle/trans/base.rs diff --git a/src/rustc/middle/trans/block.rs b/src/librustc/middle/trans/block.rs similarity index 100% rename from src/rustc/middle/trans/block.rs rename to src/librustc/middle/trans/block.rs diff --git a/src/rustc/middle/trans/build.rs b/src/librustc/middle/trans/build.rs similarity index 100% rename from src/rustc/middle/trans/build.rs rename to src/librustc/middle/trans/build.rs diff --git a/src/rustc/middle/trans/callee.rs b/src/librustc/middle/trans/callee.rs similarity index 100% rename from src/rustc/middle/trans/callee.rs rename to src/librustc/middle/trans/callee.rs diff --git a/src/rustc/middle/trans/closure.rs b/src/librustc/middle/trans/closure.rs similarity index 100% rename from src/rustc/middle/trans/closure.rs rename to src/librustc/middle/trans/closure.rs diff --git a/src/rustc/middle/trans/common.rs b/src/librustc/middle/trans/common.rs similarity index 100% rename from src/rustc/middle/trans/common.rs rename to src/librustc/middle/trans/common.rs diff --git a/src/rustc/middle/trans/consts.rs b/src/librustc/middle/trans/consts.rs similarity index 100% rename from src/rustc/middle/trans/consts.rs rename to src/librustc/middle/trans/consts.rs diff --git a/src/rustc/middle/trans/controlflow.rs b/src/librustc/middle/trans/controlflow.rs similarity index 100% rename from src/rustc/middle/trans/controlflow.rs rename to src/librustc/middle/trans/controlflow.rs diff --git a/src/rustc/middle/trans/datum.rs b/src/librustc/middle/trans/datum.rs similarity index 100% rename from src/rustc/middle/trans/datum.rs rename to src/librustc/middle/trans/datum.rs diff --git a/src/rustc/middle/trans/debuginfo.rs b/src/librustc/middle/trans/debuginfo.rs similarity index 100% rename from src/rustc/middle/trans/debuginfo.rs rename to src/librustc/middle/trans/debuginfo.rs diff --git a/src/rustc/middle/trans/deriving.rs b/src/librustc/middle/trans/deriving.rs similarity index 100% rename from src/rustc/middle/trans/deriving.rs rename to src/librustc/middle/trans/deriving.rs diff --git a/src/rustc/middle/trans/expr.rs b/src/librustc/middle/trans/expr.rs similarity index 100% rename from src/rustc/middle/trans/expr.rs rename to src/librustc/middle/trans/expr.rs diff --git a/src/rustc/middle/trans/foreign.rs b/src/librustc/middle/trans/foreign.rs similarity index 100% rename from src/rustc/middle/trans/foreign.rs rename to src/librustc/middle/trans/foreign.rs diff --git a/src/rustc/middle/trans/glue.rs b/src/librustc/middle/trans/glue.rs similarity index 100% rename from src/rustc/middle/trans/glue.rs rename to src/librustc/middle/trans/glue.rs diff --git a/src/rustc/middle/trans/inline.rs b/src/librustc/middle/trans/inline.rs similarity index 100% rename from src/rustc/middle/trans/inline.rs rename to src/librustc/middle/trans/inline.rs diff --git a/src/rustc/middle/trans/machine.rs b/src/librustc/middle/trans/machine.rs similarity index 100% rename from src/rustc/middle/trans/machine.rs rename to src/librustc/middle/trans/machine.rs diff --git a/src/rustc/middle/trans/macros.rs b/src/librustc/middle/trans/macros.rs similarity index 100% rename from src/rustc/middle/trans/macros.rs rename to src/librustc/middle/trans/macros.rs diff --git a/src/rustc/middle/trans/meth.rs b/src/librustc/middle/trans/meth.rs similarity index 100% rename from src/rustc/middle/trans/meth.rs rename to src/librustc/middle/trans/meth.rs diff --git a/src/rustc/middle/trans/monomorphize.rs b/src/librustc/middle/trans/monomorphize.rs similarity index 100% rename from src/rustc/middle/trans/monomorphize.rs rename to src/librustc/middle/trans/monomorphize.rs diff --git a/src/rustc/middle/trans/reachable.rs b/src/librustc/middle/trans/reachable.rs similarity index 100% rename from src/rustc/middle/trans/reachable.rs rename to src/librustc/middle/trans/reachable.rs diff --git a/src/rustc/middle/trans/reflect.rs b/src/librustc/middle/trans/reflect.rs similarity index 100% rename from src/rustc/middle/trans/reflect.rs rename to src/librustc/middle/trans/reflect.rs diff --git a/src/rustc/middle/trans/shape.rs b/src/librustc/middle/trans/shape.rs similarity index 100% rename from src/rustc/middle/trans/shape.rs rename to src/librustc/middle/trans/shape.rs diff --git a/src/rustc/middle/trans/tvec.rs b/src/librustc/middle/trans/tvec.rs similarity index 100% rename from src/rustc/middle/trans/tvec.rs rename to src/librustc/middle/trans/tvec.rs diff --git a/src/rustc/middle/trans/type_of.rs b/src/librustc/middle/trans/type_of.rs similarity index 100% rename from src/rustc/middle/trans/type_of.rs rename to src/librustc/middle/trans/type_of.rs diff --git a/src/rustc/middle/trans/type_use.rs b/src/librustc/middle/trans/type_use.rs similarity index 100% rename from src/rustc/middle/trans/type_use.rs rename to src/librustc/middle/trans/type_use.rs diff --git a/src/rustc/middle/trans/uniq.rs b/src/librustc/middle/trans/uniq.rs similarity index 100% rename from src/rustc/middle/trans/uniq.rs rename to src/librustc/middle/trans/uniq.rs diff --git a/src/rustc/middle/ty.rs b/src/librustc/middle/ty.rs similarity index 100% rename from src/rustc/middle/ty.rs rename to src/librustc/middle/ty.rs diff --git a/src/rustc/middle/typeck.rs b/src/librustc/middle/typeck.rs similarity index 100% rename from src/rustc/middle/typeck.rs rename to src/librustc/middle/typeck.rs diff --git a/src/rustc/middle/typeck/astconv.rs b/src/librustc/middle/typeck/astconv.rs similarity index 100% rename from src/rustc/middle/typeck/astconv.rs rename to src/librustc/middle/typeck/astconv.rs diff --git a/src/rustc/middle/typeck/check.rs b/src/librustc/middle/typeck/check.rs similarity index 100% rename from src/rustc/middle/typeck/check.rs rename to src/librustc/middle/typeck/check.rs diff --git a/src/rustc/middle/typeck/check/alt.rs b/src/librustc/middle/typeck/check/alt.rs similarity index 100% rename from src/rustc/middle/typeck/check/alt.rs rename to src/librustc/middle/typeck/check/alt.rs diff --git a/src/rustc/middle/typeck/check/demand.rs b/src/librustc/middle/typeck/check/demand.rs similarity index 100% rename from src/rustc/middle/typeck/check/demand.rs rename to src/librustc/middle/typeck/check/demand.rs diff --git a/src/rustc/middle/typeck/check/method.rs b/src/librustc/middle/typeck/check/method.rs similarity index 100% rename from src/rustc/middle/typeck/check/method.rs rename to src/librustc/middle/typeck/check/method.rs diff --git a/src/rustc/middle/typeck/check/regionck.rs b/src/librustc/middle/typeck/check/regionck.rs similarity index 100% rename from src/rustc/middle/typeck/check/regionck.rs rename to src/librustc/middle/typeck/check/regionck.rs diff --git a/src/rustc/middle/typeck/check/regionmanip.rs b/src/librustc/middle/typeck/check/regionmanip.rs similarity index 100% rename from src/rustc/middle/typeck/check/regionmanip.rs rename to src/librustc/middle/typeck/check/regionmanip.rs diff --git a/src/rustc/middle/typeck/check/vtable.rs b/src/librustc/middle/typeck/check/vtable.rs similarity index 100% rename from src/rustc/middle/typeck/check/vtable.rs rename to src/librustc/middle/typeck/check/vtable.rs diff --git a/src/rustc/middle/typeck/check/writeback.rs b/src/librustc/middle/typeck/check/writeback.rs similarity index 100% rename from src/rustc/middle/typeck/check/writeback.rs rename to src/librustc/middle/typeck/check/writeback.rs diff --git a/src/rustc/middle/typeck/coherence.rs b/src/librustc/middle/typeck/coherence.rs similarity index 100% rename from src/rustc/middle/typeck/coherence.rs rename to src/librustc/middle/typeck/coherence.rs diff --git a/src/rustc/middle/typeck/collect.rs b/src/librustc/middle/typeck/collect.rs similarity index 100% rename from src/rustc/middle/typeck/collect.rs rename to src/librustc/middle/typeck/collect.rs diff --git a/src/rustc/middle/typeck/deriving.rs b/src/librustc/middle/typeck/deriving.rs similarity index 100% rename from src/rustc/middle/typeck/deriving.rs rename to src/librustc/middle/typeck/deriving.rs diff --git a/src/rustc/middle/typeck/infer.rs b/src/librustc/middle/typeck/infer.rs similarity index 100% rename from src/rustc/middle/typeck/infer.rs rename to src/librustc/middle/typeck/infer.rs diff --git a/src/rustc/middle/typeck/infer/assignment.rs b/src/librustc/middle/typeck/infer/assignment.rs similarity index 100% rename from src/rustc/middle/typeck/infer/assignment.rs rename to src/librustc/middle/typeck/infer/assignment.rs diff --git a/src/rustc/middle/typeck/infer/combine.rs b/src/librustc/middle/typeck/infer/combine.rs similarity index 100% rename from src/rustc/middle/typeck/infer/combine.rs rename to src/librustc/middle/typeck/infer/combine.rs diff --git a/src/rustc/middle/typeck/infer/glb.rs b/src/librustc/middle/typeck/infer/glb.rs similarity index 100% rename from src/rustc/middle/typeck/infer/glb.rs rename to src/librustc/middle/typeck/infer/glb.rs diff --git a/src/rustc/middle/typeck/infer/integral.rs b/src/librustc/middle/typeck/infer/integral.rs similarity index 100% rename from src/rustc/middle/typeck/infer/integral.rs rename to src/librustc/middle/typeck/infer/integral.rs diff --git a/src/rustc/middle/typeck/infer/lattice.rs b/src/librustc/middle/typeck/infer/lattice.rs similarity index 100% rename from src/rustc/middle/typeck/infer/lattice.rs rename to src/librustc/middle/typeck/infer/lattice.rs diff --git a/src/rustc/middle/typeck/infer/lub.rs b/src/librustc/middle/typeck/infer/lub.rs similarity index 100% rename from src/rustc/middle/typeck/infer/lub.rs rename to src/librustc/middle/typeck/infer/lub.rs diff --git a/src/rustc/middle/typeck/infer/macros.rs b/src/librustc/middle/typeck/infer/macros.rs similarity index 100% rename from src/rustc/middle/typeck/infer/macros.rs rename to src/librustc/middle/typeck/infer/macros.rs diff --git a/src/rustc/middle/typeck/infer/region_inference.rs b/src/librustc/middle/typeck/infer/region_inference.rs similarity index 100% rename from src/rustc/middle/typeck/infer/region_inference.rs rename to src/librustc/middle/typeck/infer/region_inference.rs diff --git a/src/rustc/middle/typeck/infer/resolve.rs b/src/librustc/middle/typeck/infer/resolve.rs similarity index 100% rename from src/rustc/middle/typeck/infer/resolve.rs rename to src/librustc/middle/typeck/infer/resolve.rs diff --git a/src/rustc/middle/typeck/infer/sub.rs b/src/librustc/middle/typeck/infer/sub.rs similarity index 100% rename from src/rustc/middle/typeck/infer/sub.rs rename to src/librustc/middle/typeck/infer/sub.rs diff --git a/src/rustc/middle/typeck/infer/to_str.rs b/src/librustc/middle/typeck/infer/to_str.rs similarity index 100% rename from src/rustc/middle/typeck/infer/to_str.rs rename to src/librustc/middle/typeck/infer/to_str.rs diff --git a/src/rustc/middle/typeck/infer/unify.rs b/src/librustc/middle/typeck/infer/unify.rs similarity index 100% rename from src/rustc/middle/typeck/infer/unify.rs rename to src/librustc/middle/typeck/infer/unify.rs diff --git a/src/rustc/middle/typeck/rscope.rs b/src/librustc/middle/typeck/rscope.rs similarity index 100% rename from src/rustc/middle/typeck/rscope.rs rename to src/librustc/middle/typeck/rscope.rs diff --git a/src/rustc/rustc.rc b/src/librustc/rustc.rc similarity index 100% rename from src/rustc/rustc.rc rename to src/librustc/rustc.rc diff --git a/src/rustc/driver/rustc.rs b/src/librustc/rustc.rs similarity index 95% rename from src/rustc/driver/rustc.rs rename to src/librustc/rustc.rs index a6de92ceeb3e1bec306a0572c5289bc51b520f0b..8b832b9ab9f8773985e3e332e3b80b5153a74f71 100644 --- a/src/rustc/driver/rustc.rs +++ b/src/librustc/rustc.rs @@ -1,15 +1,3 @@ -#[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; @@ -17,11 +5,15 @@ 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 b/src/librustc/util/common.rs similarity index 100% rename from src/rustc/util/common.rs rename to src/librustc/util/common.rs diff --git a/src/rustc/util/ppaux.rs b/src/librustc/util/ppaux.rs similarity index 100% rename from src/rustc/util/ppaux.rs rename to src/librustc/util/ppaux.rs