---

yaml
---
r: 36229
b: refs/heads/try2
c: 69a8b4d
h: refs/heads/master
i:
  36227: 1aa20d3
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: f72ef31ede98d0605195b2a6baba38f71d0177a0
+refs/heads/try2: 69a8b4d8e20df44766fad153b6300b0a6e7e3d5e
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/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

branches/try2/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))			\

branches/try2/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 $$@ $$<

branches/try2/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() }

branches/try2/src/rustc/README.txt renamed to branches/try2/src/librustc/README.txt

@@ -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";