From 7dcbaedd329295e1f2692bb2d9eae860a820d0a8 Mon Sep 17 00:00:00 2001
From: Kevin Cantu <me@kevincantu.org>
Date: Tue, 29 May 2012 21:35:12 -0700
Subject: [PATCH] Rename librustsyntax to libsyntax

Per issue #2418.
---
 Makefile.in                                          | 12 ++++++------
 mk/clean.mk                                          |  8 ++++----
 mk/dist.mk                                           |  2 +-
 mk/host.mk                                           | 10 +++++-----
 mk/install.mk                                        |  6 +++---
 mk/target.mk                                         |  6 +++---
 mk/tests.mk                                          |  2 +-
 src/cargo/cargo.rc                                   |  2 +-
 src/etc/snapshot.py                                  |  1 +
 src/fuzzer/fuzzer.rc                                 |  2 +-
 src/{librustsyntax => libsyntax}/ast.rs              |  0
 src/{librustsyntax => libsyntax}/ast_map.rs          |  0
 src/{librustsyntax => libsyntax}/ast_util.rs         |  0
 src/{librustsyntax => libsyntax}/attr.rs             |  0
 src/{librustsyntax => libsyntax}/codemap.rs          |  0
 src/{librustsyntax => libsyntax}/diagnostic.rs       |  0
 .../ext/auto_serialize.rs                            |  0
 src/{librustsyntax => libsyntax}/ext/base.rs         |  0
 src/{librustsyntax => libsyntax}/ext/build.rs        |  0
 .../ext/concat_idents.rs                             |  0
 src/{librustsyntax => libsyntax}/ext/env.rs          |  0
 src/{librustsyntax => libsyntax}/ext/expand.rs       |  0
 src/{librustsyntax => libsyntax}/ext/fmt.rs          |  0
 src/{librustsyntax => libsyntax}/ext/ident_to_str.rs |  0
 src/{librustsyntax => libsyntax}/ext/log_syntax.rs   |  0
 src/{librustsyntax => libsyntax}/ext/qquote.rs       |  0
 src/{librustsyntax => libsyntax}/ext/simplext.rs     |  0
 src/{librustsyntax => libsyntax}/ext/source_util.rs  |  0
 src/{librustsyntax => libsyntax}/fold.rs             |  0
 src/{librustsyntax => libsyntax}/parse.rs            |  0
 src/{librustsyntax => libsyntax}/parse/attr.rs       |  0
 src/{librustsyntax => libsyntax}/parse/classify.rs   |  0
 src/{librustsyntax => libsyntax}/parse/comments.rs   |  0
 src/{librustsyntax => libsyntax}/parse/common.rs     |  0
 src/{librustsyntax => libsyntax}/parse/eval.rs       |  0
 src/{librustsyntax => libsyntax}/parse/lexer.rs      |  0
 src/{librustsyntax => libsyntax}/parse/parser.rs     |  0
 src/{librustsyntax => libsyntax}/parse/prec.rs       |  0
 src/{librustsyntax => libsyntax}/parse/token.rs      |  0
 src/{librustsyntax => libsyntax}/print/pp.rs         |  0
 src/{librustsyntax => libsyntax}/print/pprust.rs     |  0
 .../rustsyntax.rc => libsyntax/syntax.rc}            |  6 ++++--
 src/{librustsyntax => libsyntax}/util/interner.rs    |  0
 src/{librustsyntax => libsyntax}/visit.rs            |  0
 src/rustc/driver/rustc.rs                            |  2 +-
 src/rustc/metadata/astencode.rs                      |  2 +-
 src/rustc/rustc.rc                                   |  2 +-
 src/rustdoc/rustdoc.rc                               |  2 +-
 src/test/compile-fail/qquote-1.rs                    |  2 +-
 src/test/compile-fail/qquote-2.rs                    |  2 +-
 src/test/run-pass/issue-1926.rs                      |  2 +-
 src/test/run-pass/qquote.rs                          |  2 +-
 52 files changed, 38 insertions(+), 35 deletions(-)
 rename src/{librustsyntax => libsyntax}/ast.rs (100%)
 rename src/{librustsyntax => libsyntax}/ast_map.rs (100%)
 rename src/{librustsyntax => libsyntax}/ast_util.rs (100%)
 rename src/{librustsyntax => libsyntax}/attr.rs (100%)
 rename src/{librustsyntax => libsyntax}/codemap.rs (100%)
 rename src/{librustsyntax => libsyntax}/diagnostic.rs (100%)
 rename src/{librustsyntax => libsyntax}/ext/auto_serialize.rs (100%)
 rename src/{librustsyntax => libsyntax}/ext/base.rs (100%)
 rename src/{librustsyntax => libsyntax}/ext/build.rs (100%)
 rename src/{librustsyntax => libsyntax}/ext/concat_idents.rs (100%)
 rename src/{librustsyntax => libsyntax}/ext/env.rs (100%)
 rename src/{librustsyntax => libsyntax}/ext/expand.rs (100%)
 rename src/{librustsyntax => libsyntax}/ext/fmt.rs (100%)
 rename src/{librustsyntax => libsyntax}/ext/ident_to_str.rs (100%)
 rename src/{librustsyntax => libsyntax}/ext/log_syntax.rs (100%)
 rename src/{librustsyntax => libsyntax}/ext/qquote.rs (100%)
 rename src/{librustsyntax => libsyntax}/ext/simplext.rs (100%)
 rename src/{librustsyntax => libsyntax}/ext/source_util.rs (100%)
 rename src/{librustsyntax => libsyntax}/fold.rs (100%)
 rename src/{librustsyntax => libsyntax}/parse.rs (100%)
 rename src/{librustsyntax => libsyntax}/parse/attr.rs (100%)
 rename src/{librustsyntax => libsyntax}/parse/classify.rs (100%)
 rename src/{librustsyntax => libsyntax}/parse/comments.rs (100%)
 rename src/{librustsyntax => libsyntax}/parse/common.rs (100%)
 rename src/{librustsyntax => libsyntax}/parse/eval.rs (100%)
 rename src/{librustsyntax => libsyntax}/parse/lexer.rs (100%)
 rename src/{librustsyntax => libsyntax}/parse/parser.rs (100%)
 rename src/{librustsyntax => libsyntax}/parse/prec.rs (100%)
 rename src/{librustsyntax => libsyntax}/parse/token.rs (100%)
 rename src/{librustsyntax => libsyntax}/print/pp.rs (100%)
 rename src/{librustsyntax => libsyntax}/print/pprust.rs (100%)
 rename src/{librustsyntax/rustsyntax.rc => libsyntax/syntax.rc} (92%)
 rename src/{librustsyntax => libsyntax}/util/interner.rs (100%)
 rename src/{librustsyntax => libsyntax}/visit.rs (100%)

diff --git a/Makefile.in b/Makefile.in
index fd0c3b07e8d..565c370ea6d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -113,16 +113,16 @@ CFG_RUSTLLVM :=$(call CFG_LIB_NAME,rustllvm)
 CFG_CORELIB :=$(call CFG_LIB_NAME,core)
 CFG_STDLIB :=$(call CFG_LIB_NAME,std)
 CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc)
-CFG_LIBRUSTSYNTAX :=$(call CFG_LIB_NAME,rustsyntax)
+CFG_LIBSYNTAX :=$(call CFG_LIB_NAME,syntax)
 
 STDLIB_GLOB :=$(call CFG_LIB_GLOB,std)
 CORELIB_GLOB :=$(call CFG_LIB_GLOB,core)
 LIBRUSTC_GLOB :=$(call CFG_LIB_GLOB,rustc)
-LIBRUSTSYNTAX_GLOB :=$(call CFG_LIB_GLOB,rustsyntax)
+LIBSYNTAX_GLOB :=$(call CFG_LIB_GLOB,syntax)
 STDLIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,std)
 CORELIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,core)
 LIBRUSTC_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustc)
-LIBRUSTSYNTAX_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustsyntax)
+LIBSYNTAX_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,syntax)
 
 # version-string calculation
 CFG_GIT_DIR := $(CFG_SRC_DIR).git
@@ -200,9 +200,9 @@ COMPILER_INPUTS := $(filter-out $(S)src/rustc/driver/rustc.rs,     \
                        $(wildcard $(addprefix $(S)src/rustc/,      \
                            rustc.rc *.rs */*.rs */*/*.rs */*/*/*.rs)))
 
-LIBRUSTSYNTAX_CRATE := $(S)src/librustsyntax/rustsyntax.rc
-LIBRUSTSYNTAX_INPUTS := $(wildcard $(addprefix $(S)src/librustsyntax/, \
-                            rustsyntax.rc *.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
 
diff --git a/mk/clean.mk b/mk/clean.mk
index 8371757d3c9..d36cbaf7d0b 100644
--- a/mk/clean.mk
+++ b/mk/clean.mk
@@ -61,11 +61,11 @@ clean$(1)_H_$(2):
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_CORELIB)
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_STDLIB)
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC)
-	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTSYNTAX)
+	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBSYNTAX)
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CORELIB_GLOB)
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB)
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB)
-	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTSYNTAX_GLOB)
+	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB)
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUSTLLVM)
 	$(Q)rm -f $$(HLIB$(1)_H_$(2))/libstd.rlib
 
@@ -87,11 +87,11 @@ clean$(1)_T_$(2)_H_$(3):
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB)
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB)
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC)
-	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTSYNTAX)
+	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX)
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CORELIB_GLOB)
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_GLOB)
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB)
-	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTSYNTAX_GLOB)
+	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB)
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM)
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
 	$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a
diff --git a/mk/dist.mk b/mk/dist.mk
index 7ccd7b6690d..d65266b2d46 100644
--- a/mk/dist.mk
+++ b/mk/dist.mk
@@ -28,7 +28,7 @@ PKG_FILES := \
       etc                                      \
       fuzzer                                   \
       libcore                                  \
-      librustsyntax                            \
+      libsyntax                                \
       libstd                                   \
       rt                                       \
       rustdoc                                  \
diff --git a/mk/host.mk b/mk/host.mk
index 1065ac3f396..c71e48f6f12 100644
--- a/mk/host.mk
+++ b/mk/host.mk
@@ -23,7 +23,7 @@ $$(HBIN$(2)_H_$(4))/rustc$$(X): \
 
 $$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC): \
 	$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTC) \
-	$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTSYNTAX) \
+	$$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX) \
 	$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME) \
 	$$(HLIB$(2)_H_$(4))/$$(CFG_RUSTLLVM) \
 	$$(HCORELIB_DEFAULT$(2)_H_$(3)) \
@@ -34,16 +34,16 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC): \
 		$$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_DSYM_GLOB) \
 	        $$(HLIB$(2)_H_$(4))
 
-$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTSYNTAX): \
-	$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTSYNTAX) \
+$$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX): \
+	$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBSYNTAX) \
 	$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME) \
 	$$(HLIB$(2)_H_$(4))/$$(CFG_RUSTLLVM) \
 	$$(HCORELIB_DEFAULT$(2)_H_$(3)) \
 	$$(HSTDLIB_DEFAULT$(2)_H_$(3))
 	@$$(call E, cp: $$@)
 	$$(Q)cp $$< $$@
-	$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTSYNTAX_GLOB) \
-		$$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTSYNTAX_DSYM_GLOB) \
+	$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_GLOB) \
+		$$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_DSYM_GLOB) \
 	        $$(HLIB$(2)_H_$(4))
 
 $$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME): \
diff --git a/mk/install.mk b/mk/install.mk
index bc8df87c7b2..af84c7023ab 100644
--- a/mk/install.mk
+++ b/mk/install.mk
@@ -43,7 +43,7 @@ install-target-$(1)-host-$(2): $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
 	$$(Q)$$(call INSTALL_LIB, \
 		$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB))
 	$$(Q)$$(call INSTALL_LIB, \
-		$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTSYNTAX_GLOB))
+		$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBSYNTAX_GLOB))
 	$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
 
 endef
@@ -77,7 +77,7 @@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE))
 	$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB))
 	$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB))
 	$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB))
-	$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTSYNTAX_GLOB))
+	$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBSYNTAX_GLOB))
 	$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM))
 	$(Q)$(call INSTALL,$(S)/man, \
 	     $(PREFIX_ROOT)/share/man/man1,rustc.1)
@@ -98,7 +98,7 @@ uninstall:
           $(call HOST_LIB_FROM_HL_GLOB,$(CORELIB_GLOB)) \
           $(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB)) \
           $(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB)) \
-          $(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTSYNTAX_GLOB)) \
+          $(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB)) \
         ; \
         do rm -f $$i ; \
         done
diff --git a/mk/target.mk b/mk/target.mk
index fc59018d946..5ddc825d335 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -32,12 +32,12 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X):				\
 
 $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC):		\
 		$$(COMPILER_CRATE) $$(COMPILER_INPUTS)		\
-                $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTSYNTAX)
+                $$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX)
 	@$$(call E, compile_and_link: $$@)
 	$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< && touch $$@
 
-$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTSYNTAX): \
-                $$(LIBRUSTSYNTAX_CRATE) $$(LIBRUSTSYNTAX_INPUTS) \
+$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX): \
+                $$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
 		$$(TSREQ$(1)_T_$(2)_H_$(3))			\
 		$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM)	\
 		$$(TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3))      \
diff --git a/mk/tests.mk b/mk/tests.mk
index 3f67c50a42a..5c8ae430c14 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -179,7 +179,7 @@ define TEST_STAGEN
 TEST_SREQ$(1)_T_$(2)_H_$(3) = \
 	$$(HBIN$(1)_H_$(3))/compiletest$$(X) \
 	$$(HSREQ$(1)_$(2)_$(3)) \
-	$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTSYNTAX)
+	$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX)
 
 
 check-stage$(1)-T-$(2)-H-$(3): tidy				\
diff --git a/src/cargo/cargo.rc b/src/cargo/cargo.rc
index c0296575c1f..2ed264719c2 100644
--- a/src/cargo/cargo.rc
+++ b/src/cargo/cargo.rc
@@ -22,7 +22,7 @@
 use core(vers = "0.2");
 use std(vers = "0.2");
 use rustc(vers = "0.2");
-use syntax(name = "rustsyntax", vers = "0.2");
+use syntax(vers = "0.2");
 
 import core::*;
 
diff --git a/src/etc/snapshot.py b/src/etc/snapshot.py
index 1e56c274d80..c75c8ed2952 100644
--- a/src/etc/snapshot.py
+++ b/src/etc/snapshot.py
@@ -22,6 +22,7 @@ download_url_base = "http://dl.rust-lang.org/stage0-snapshots"
 download_dir_base = "dl"
 download_unpack_base = os.path.join(download_dir_base, "unpack")
 
+# FIXME: s/librustsyntax/libsyntax/ once the snapshots exist with it
 snapshot_files = {
     "linux": ["bin/rustc",
               "lib/libcore-*.so",
diff --git a/src/fuzzer/fuzzer.rc b/src/fuzzer/fuzzer.rc
index ae16acffe71..c04fa0d2f39 100644
--- a/src/fuzzer/fuzzer.rc
+++ b/src/fuzzer/fuzzer.rc
@@ -6,7 +6,7 @@
 
 use core(vers = "0.2");
 use std(vers = "0.2");
-use syntax(name = "rustsyntax", vers = "0.2");
+use syntax(vers = "0.2");
 
 import core::*;
 
diff --git a/src/librustsyntax/ast.rs b/src/libsyntax/ast.rs
similarity index 100%
rename from src/librustsyntax/ast.rs
rename to src/libsyntax/ast.rs
diff --git a/src/librustsyntax/ast_map.rs b/src/libsyntax/ast_map.rs
similarity index 100%
rename from src/librustsyntax/ast_map.rs
rename to src/libsyntax/ast_map.rs
diff --git a/src/librustsyntax/ast_util.rs b/src/libsyntax/ast_util.rs
similarity index 100%
rename from src/librustsyntax/ast_util.rs
rename to src/libsyntax/ast_util.rs
diff --git a/src/librustsyntax/attr.rs b/src/libsyntax/attr.rs
similarity index 100%
rename from src/librustsyntax/attr.rs
rename to src/libsyntax/attr.rs
diff --git a/src/librustsyntax/codemap.rs b/src/libsyntax/codemap.rs
similarity index 100%
rename from src/librustsyntax/codemap.rs
rename to src/libsyntax/codemap.rs
diff --git a/src/librustsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs
similarity index 100%
rename from src/librustsyntax/diagnostic.rs
rename to src/libsyntax/diagnostic.rs
diff --git a/src/librustsyntax/ext/auto_serialize.rs b/src/libsyntax/ext/auto_serialize.rs
similarity index 100%
rename from src/librustsyntax/ext/auto_serialize.rs
rename to src/libsyntax/ext/auto_serialize.rs
diff --git a/src/librustsyntax/ext/base.rs b/src/libsyntax/ext/base.rs
similarity index 100%
rename from src/librustsyntax/ext/base.rs
rename to src/libsyntax/ext/base.rs
diff --git a/src/librustsyntax/ext/build.rs b/src/libsyntax/ext/build.rs
similarity index 100%
rename from src/librustsyntax/ext/build.rs
rename to src/libsyntax/ext/build.rs
diff --git a/src/librustsyntax/ext/concat_idents.rs b/src/libsyntax/ext/concat_idents.rs
similarity index 100%
rename from src/librustsyntax/ext/concat_idents.rs
rename to src/libsyntax/ext/concat_idents.rs
diff --git a/src/librustsyntax/ext/env.rs b/src/libsyntax/ext/env.rs
similarity index 100%
rename from src/librustsyntax/ext/env.rs
rename to src/libsyntax/ext/env.rs
diff --git a/src/librustsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs
similarity index 100%
rename from src/librustsyntax/ext/expand.rs
rename to src/libsyntax/ext/expand.rs
diff --git a/src/librustsyntax/ext/fmt.rs b/src/libsyntax/ext/fmt.rs
similarity index 100%
rename from src/librustsyntax/ext/fmt.rs
rename to src/libsyntax/ext/fmt.rs
diff --git a/src/librustsyntax/ext/ident_to_str.rs b/src/libsyntax/ext/ident_to_str.rs
similarity index 100%
rename from src/librustsyntax/ext/ident_to_str.rs
rename to src/libsyntax/ext/ident_to_str.rs
diff --git a/src/librustsyntax/ext/log_syntax.rs b/src/libsyntax/ext/log_syntax.rs
similarity index 100%
rename from src/librustsyntax/ext/log_syntax.rs
rename to src/libsyntax/ext/log_syntax.rs
diff --git a/src/librustsyntax/ext/qquote.rs b/src/libsyntax/ext/qquote.rs
similarity index 100%
rename from src/librustsyntax/ext/qquote.rs
rename to src/libsyntax/ext/qquote.rs
diff --git a/src/librustsyntax/ext/simplext.rs b/src/libsyntax/ext/simplext.rs
similarity index 100%
rename from src/librustsyntax/ext/simplext.rs
rename to src/libsyntax/ext/simplext.rs
diff --git a/src/librustsyntax/ext/source_util.rs b/src/libsyntax/ext/source_util.rs
similarity index 100%
rename from src/librustsyntax/ext/source_util.rs
rename to src/libsyntax/ext/source_util.rs
diff --git a/src/librustsyntax/fold.rs b/src/libsyntax/fold.rs
similarity index 100%
rename from src/librustsyntax/fold.rs
rename to src/libsyntax/fold.rs
diff --git a/src/librustsyntax/parse.rs b/src/libsyntax/parse.rs
similarity index 100%
rename from src/librustsyntax/parse.rs
rename to src/libsyntax/parse.rs
diff --git a/src/librustsyntax/parse/attr.rs b/src/libsyntax/parse/attr.rs
similarity index 100%
rename from src/librustsyntax/parse/attr.rs
rename to src/libsyntax/parse/attr.rs
diff --git a/src/librustsyntax/parse/classify.rs b/src/libsyntax/parse/classify.rs
similarity index 100%
rename from src/librustsyntax/parse/classify.rs
rename to src/libsyntax/parse/classify.rs
diff --git a/src/librustsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs
similarity index 100%
rename from src/librustsyntax/parse/comments.rs
rename to src/libsyntax/parse/comments.rs
diff --git a/src/librustsyntax/parse/common.rs b/src/libsyntax/parse/common.rs
similarity index 100%
rename from src/librustsyntax/parse/common.rs
rename to src/libsyntax/parse/common.rs
diff --git a/src/librustsyntax/parse/eval.rs b/src/libsyntax/parse/eval.rs
similarity index 100%
rename from src/librustsyntax/parse/eval.rs
rename to src/libsyntax/parse/eval.rs
diff --git a/src/librustsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs
similarity index 100%
rename from src/librustsyntax/parse/lexer.rs
rename to src/libsyntax/parse/lexer.rs
diff --git a/src/librustsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
similarity index 100%
rename from src/librustsyntax/parse/parser.rs
rename to src/libsyntax/parse/parser.rs
diff --git a/src/librustsyntax/parse/prec.rs b/src/libsyntax/parse/prec.rs
similarity index 100%
rename from src/librustsyntax/parse/prec.rs
rename to src/libsyntax/parse/prec.rs
diff --git a/src/librustsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
similarity index 100%
rename from src/librustsyntax/parse/token.rs
rename to src/libsyntax/parse/token.rs
diff --git a/src/librustsyntax/print/pp.rs b/src/libsyntax/print/pp.rs
similarity index 100%
rename from src/librustsyntax/print/pp.rs
rename to src/libsyntax/print/pp.rs
diff --git a/src/librustsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
similarity index 100%
rename from src/librustsyntax/print/pprust.rs
rename to src/libsyntax/print/pprust.rs
diff --git a/src/librustsyntax/rustsyntax.rc b/src/libsyntax/syntax.rc
similarity index 92%
rename from src/librustsyntax/rustsyntax.rc
rename to src/libsyntax/syntax.rc
index eeb2d31d6a3..8284138c675 100644
--- a/src/librustsyntax/rustsyntax.rc
+++ b/src/libsyntax/syntax.rc
@@ -1,6 +1,8 @@
-#[link(name = "rustsyntax",
+#[link(name = "syntax",
        vers = "0.2",
-       uuid = "c2b79dd0-a437-4ec7-95f9-858d77808c2f")];
+       uuid = "9311401b-d6ea-4cd9-a1d9-61f89499c645")];
+
+
 
 #[crate_type = "lib"];
 
diff --git a/src/librustsyntax/util/interner.rs b/src/libsyntax/util/interner.rs
similarity index 100%
rename from src/librustsyntax/util/interner.rs
rename to src/libsyntax/util/interner.rs
diff --git a/src/librustsyntax/visit.rs b/src/libsyntax/visit.rs
similarity index 100%
rename from src/librustsyntax/visit.rs
rename to src/libsyntax/visit.rs
diff --git a/src/rustc/driver/rustc.rs b/src/rustc/driver/rustc.rs
index a4810d36a8e..5be463ee7a9 100644
--- a/src/rustc/driver/rustc.rs
+++ b/src/rustc/driver/rustc.rs
@@ -3,7 +3,7 @@
 use core(vers = "0.2");
 use std(vers = "0.2");
 use rustc(vers = "0.2");
-use syntax(name = "rustsyntax", vers = "0.2");
+use syntax(vers = "0.2");
 
 import core::*;
 
diff --git a/src/rustc/metadata/astencode.rs b/src/rustc/metadata/astencode.rs
index a7bcfbc74e9..b6b0060b5fb 100644
--- a/src/rustc/metadata/astencode.rs
+++ b/src/rustc/metadata/astencode.rs
@@ -107,7 +107,7 @@ fn decode_inlined_item(cdata: cstore::crate_metadata,
         alt ii {
           ast::ii_item(i) {
             #debug(">>> DECODED ITEM >>>\n%s\n<<< DECODED ITEM <<<",
-                   rustsyntax::print::pprust::item_to_str(i));
+                   syntax::print::pprust::item_to_str(i));
           }
           _ { }
         }
diff --git a/src/rustc/rustc.rc b/src/rustc/rustc.rc
index fd200efe624..c7f82da667a 100644
--- a/src/rustc/rustc.rc
+++ b/src/rustc/rustc.rc
@@ -13,7 +13,7 @@
 
 use core(vers = "0.2");
 use std(vers = "0.2");
-use syntax(name = "rustsyntax", vers = "0.2");
+use syntax(vers = "0.2");
 
 import core::*;
 
diff --git a/src/rustdoc/rustdoc.rc b/src/rustdoc/rustdoc.rc
index bcb833df5b5..b7fc9de5994 100644
--- a/src/rustdoc/rustdoc.rc
+++ b/src/rustdoc/rustdoc.rc
@@ -14,7 +14,7 @@
 use core(vers = "0.2");
 use std(vers = "0.2");
 use rustc(vers = "0.2");
-use syntax(name = "rustsyntax", vers = "0.2");
+use syntax(vers = "0.2");
 
 import core::*;
 
diff --git a/src/test/compile-fail/qquote-1.rs b/src/test/compile-fail/qquote-1.rs
index 49c0407d3fb..0750a7c9dfd 100644
--- a/src/test/compile-fail/qquote-1.rs
+++ b/src/test/compile-fail/qquote-1.rs
@@ -1,7 +1,7 @@
 // xfail-pretty
 
 use std;
-use syntax(name = "rustsyntax");
+use syntax;
 
 import io::*;
 
diff --git a/src/test/compile-fail/qquote-2.rs b/src/test/compile-fail/qquote-2.rs
index 87a604d6b54..a4871e5d497 100644
--- a/src/test/compile-fail/qquote-2.rs
+++ b/src/test/compile-fail/qquote-2.rs
@@ -1,7 +1,7 @@
 // xfail-pretty
 
 use std;
-use syntax(name = "rustsyntax");
+use syntax;
 
 import std::io::*;
 
diff --git a/src/test/run-pass/issue-1926.rs b/src/test/run-pass/issue-1926.rs
index 95171f2c729..383a1acec39 100644
--- a/src/test/run-pass/issue-1926.rs
+++ b/src/test/run-pass/issue-1926.rs
@@ -1,6 +1,6 @@
 // xfail-test
 // fails pretty printing for some reason
-use syntax(name = "rustsyntax");
+use syntax;
 import syntax::diagnostic;
 import syntax;
 import syntax::ast;
diff --git a/src/test/run-pass/qquote.rs b/src/test/run-pass/qquote.rs
index 750102b73a2..b2c0bf98b36 100644
--- a/src/test/run-pass/qquote.rs
+++ b/src/test/run-pass/qquote.rs
@@ -1,7 +1,7 @@
 // xfail-pretty
 
 use std;
-use syntax(name = "rustsyntax");
+use syntax;
 
 import io::*;