Merge remote-tracking branch 'brson/repl'

Conflicts:
	mk/install.mk
	src/rt/rustrt.def.in

diff --cc AUTHORS.txt
Simple merge

diff --cc Makefile.in
Simple merge

diff --cc configure
Simple merge

diff --cc mk/install.mk
index a26572f413a09c6bf53b9e8713e7a92182e0c872,8bc691e813e0b45d7a13b3d50457691dcdcd9d35..1ba5fe63912bf6d85540d473a686111be8b28c65
--- 1/mk/install.mk
--- 2/mk/install.mk
+++ b/mk/install.mk
@@@ -71,12 -71,9 +71,13 @@@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_H
        $(Q)mkdir -p $(PREFIX_LIB)
        $(Q)mkdir -p $(PREFIX_ROOT)/share/man/man1
        $(Q)$(call INSTALL,$(HB2),$(PHB),rustc$(X))
 +      $(Q)$(call INSTALL,$(HB2),$(PHB),fuzzer$(X))
 +      $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBFUZZER))
        $(Q)$(call INSTALL,$(HB2),$(PHB),cargo$(X))
 +      $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBCARGO))
+       $(Q)$(call INSTALL,$(HB2),$(PHB),rusti$(X))
        $(Q)$(call INSTALL,$(HB2),$(PHB),rustdoc$(X))
 +      $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_LIBRUSTDOC))
        $(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME))
        $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB))
        $(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB))
@@@ -95,11 -92,9 +96,12 @@@ HOST_LIB_FROM_HL_GLOB = 
  uninstall:
        $(Q)rm -f $(PHB)/rustc$(X)
        $(Q)rm -f $(PHB)/cargo$(X)
+       $(Q)rm -f $(PHB)/rusti$(X)
        $(Q)rm -f $(PHB)/rustdoc$(X)
        $(Q)rm -f $(PHL)/$(CFG_RUSTLLVM)
 +      $(Q)rm -f $(PHL)/$(CFG_FUZZER)
 +      $(Q)rm -f $(PHL)/$(CFG_CARGO)
 +      $(Q)rm -f $(PHL)/$(CFG_RUSTDOC)
        $(Q)rm -f $(PHL)/$(CFG_RUNTIME)
        $(Q)for i in \
            $(call HOST_LIB_FROM_HL_GLOB,$(CORELIB_GLOB)) \

diff --cc mk/rt.mk
Simple merge

diff --cc mk/tests.mk
Simple merge

diff --cc mk/tools.mk
index 011a7912852dac0a0b0c8823052afb9faa399258,cdfad867126f62efe8117a3f135115f1dc541639..98356985654b2319c843b9b36aae8cb5d6b6ab11
--- 1/mk/tools.mk
--- 2/mk/tools.mk
+++ b/mk/tools.mk
@@@ -15,9 -13,13 +15,13 @@@ CARGO_LIB := $(S)src/libcargo/cargo.r
  CARGO_INPUTS := $(wildcard $(S)src/cargo/*rs)
  
  # Rustdoc, the documentation tool
 -RUSTDOC_CRATE := $(S)src/rustdoc/rustdoc.rc
 +RUSTDOC_LIB := $(S)src/librustdoc/rustdoc.rc
  RUSTDOC_INPUTS := $(wildcard $(S)src/rustdoc/*.rs)
  
+ # Rusti, the JIT REPL
+ RUSTI_CRATE := $(S)src/rusti/rusti.rc
+ RUSTI_INPUTS := $(wildcard $(S)src/rusti/*.rs)
+ 
  # FIXME: These are only built for the host arch. Eventually we'll
  # have tools that need to built for other targets.
  define TOOLS_STAGE_N

diff --cc src/libstd/std.rc
Simple merge

diff --cc src/rt/rustrt.def.in
index 1eedb8d5e288e13a476bb40ba995cbd93b13dcf8,0668479a48d0aaae2ddfec519f1a5d055c6b9ab2..8dac7d515b36fa39caeae6e94745127fcc38f6eb
--- 1/src/rt/rustrt.def.in
--- 2/src/rt/rustrt.def.in
+++ b/src/rt/rustrt.def.in
@@@ -198,8 -202,12 +198,15 @@@ rust_task_dere
  rust_call_tydesc_glue
  tdefl_compress_mem_to_heap
  tinfl_decompress_mem_to_heap
 -rust_annihilate_box
  rust_gc_metadata
 +rust_uv_ip4_port
 +rust_uv_ip6_port
 +rust_uv_tcp_getpeername
 +rust_uv_tcp_getpeername6
+ linenoise
+ linenoiseSetCompletionCallback
+ linenoiseAddCompletion
+ linenoiseHistoryAdd
+ linenoiseHistorySetMaxLen
+ linenoiseHistorySave
+ linenoiseHistoryLoad