---

yaml
---
r: 11893
b: refs/heads/master
c: d365ec5
h: refs/heads/master
i:
  11891: 3ff4cc1
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3dca3393fa6459da14151b22f403b3f3b8dada55
+refs/heads/master: d365ec5c7d28ddf2907e722221c72228233843a7
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/Makefile.in

@@ -414,12 +414,7 @@ FUZZ := $(HBIN3_H_$(CFG_HOST_TRIPLE))/fuzzer$(X)
 CARGO := $(HBIN3_H_$(CFG_HOST_TRIPLE))/cargo$(X)
 RUSTDOC := $(HBIN3_H_$(CFG_HOST_TRIPLE))/rustdoc$(X)
 
-all: rustc $(GENERATED) docs $(FUZZ) $(CARGO) $(RUSTDOC) serializer
-
-serializer: $(HBIN1_H_$(CFG_HOST_TRIPLE))/serializer$(X) \
-            $(SREQ1_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE))
-# ^^ Note: we use HBIN1 because that is built by the snapshot compiler
-#    and sometimes we need the serializer to build the later stages.
+all: rustc $(GENERATED) docs $(FUZZ) $(CARGO) $(RUSTDOC)
 
 endif
 

trunk/mk/tools.mk

@@ -16,11 +16,6 @@ CARGO_INPUTS := $(wildcard $(S)src/cargo/*rs)
 RUSTDOC_CRATE := $(S)src/rustdoc/rustdoc.rc
 RUSTDOC_INPUTS := $(wildcard $(S)src/rustdoc/*.rs)
 
-# Serializer, generates serialization code
-# (Should eventually move into a compiler ext)
-SERIALIZER_CRATE := $(S)src/serializer/serializer.rc
-SERIALIZER_INPUTS := $(wildcard $(S)src/serializer/*.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
@@ -88,21 +83,6 @@ $$(HBIN$(2)_H_$(4))/rustdoc$$(X):				\
 	@$$(call E, cp: $$@)
 	$$(Q)cp $$< $$@
 
-$$(TBIN$(1)_T_$(4)_H_$(3))/serializer$$(X):			\
-		$$(SERIALIZER_CRATE) $$(SERIALIZER_INPUTS)	\
-		$$(TSREQ$(1)_T_$(4)_H_$(3))					\
-		$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_CORELIB)	\
-		$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_STDLIB)	\
-		$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTC)
-	@$$(call E, compile_and_link: $$@)
-	$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$<
-
-$$(HBIN$(2)_H_$(4))/serializer$$(X):				\
-		$$(TBIN$(1)_T_$(4)_H_$(3))/serializer$$(X)	\
-		$$(HSREQ$(2)_H_$(4))
-	@$$(call E, cp: $$@)
-	$$(Q)cp $$< $$@
-
 endef
 
 $(foreach host,$(CFG_TARGET_TRIPLES),				\