Rename librustsyntax to libsyntax

Per issue #2418.

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
 

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

mk/dist.mk

@@ -28,7 +28,7 @@ PKG_FILES := \
       etc                                      \
       fuzzer                                   \
       libcore                                  \
-      librustsyntax                            \
+      libsyntax                                \
       libstd                                   \
       rt                                       \
       rustdoc                                  \

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): \

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

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))      \

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				\

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::*;
 

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",

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::*;
 

src/librustsyntax/rustsyntax.rc → src/libsyntax/syntax.rc

-#[link(name = "rustsyntax",
+#[link(name = "syntax",
        vers = "0.2",
-       uuid = "c2b79dd0-a437-4ec7-95f9-858d77808c2f")];
+       uuid = "9311401b-d6ea-4cd9-a1d9-61f89499c645")];
+
+
 
 #[crate_type = "lib"];
 

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::*;
 

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));
           }
           _ { }
         }

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::*;
 

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::*;
 

src/test/compile-fail/qquote-1.rs

 // xfail-pretty
 
 use std;
-use syntax(name = "rustsyntax");
+use syntax;
 
 import io::*;
 

src/test/compile-fail/qquote-2.rs

 // xfail-pretty
 
 use std;
-use syntax(name = "rustsyntax");
+use syntax;
 
 import std::io::*;
 

src/test/run-pass/issue-1926.rs

 // xfail-test
 // fails pretty printing for some reason
-use syntax(name = "rustsyntax");
+use syntax;
 import syntax::diagnostic;
 import syntax;
 import syntax::ast;

src/test/run-pass/qquote.rs

 // xfail-pretty
 
 use std;
-use syntax(name = "rustsyntax");
+use syntax;
 
 import io::*;