Skip to content

Commit 7dcbaed

Browse files
killerswanbrson
killerswan
authored and
brson
committed
Rename librustsyntax to libsyntax
Per issue #2418.
1 parent ff6cde7 commit 7dcbaed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+38
-35
lines changed

‎Makefile.in

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,16 @@ CFG_RUSTLLVM :=$(call CFG_LIB_NAME,rustllvm)
113113
CFG_CORELIB :=$(call CFG_LIB_NAME,core)
114114
CFG_STDLIB :=$(call CFG_LIB_NAME,std)
115115
CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc)
116-
CFG_LIBRUSTSYNTAX :=$(call CFG_LIB_NAME,rustsyntax)
116+
CFG_LIBSYNTAX :=$(call CFG_LIB_NAME,syntax)
117117

118118
STDLIB_GLOB :=$(call CFG_LIB_GLOB,std)
119119
CORELIB_GLOB :=$(call CFG_LIB_GLOB,core)
120120
LIBRUSTC_GLOB :=$(call CFG_LIB_GLOB,rustc)
121-
LIBRUSTSYNTAX_GLOB :=$(call CFG_LIB_GLOB,rustsyntax)
121+
LIBSYNTAX_GLOB :=$(call CFG_LIB_GLOB,syntax)
122122
STDLIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,std)
123123
CORELIB_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,core)
124124
LIBRUSTC_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustc)
125-
LIBRUSTSYNTAX_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,rustsyntax)
125+
LIBSYNTAX_DSYM_GLOB :=$(call CFG_LIB_DSYM_GLOB,syntax)
126126

127127
# version-string calculation
128128
CFG_GIT_DIR := $(CFG_SRC_DIR).git
@@ -200,9 +200,9 @@ COMPILER_INPUTS := $(filter-out $(S)src/rustc/driver/rustc.rs, \
200200
$(wildcard $(addprefix $(S)src/rustc/, \
201201
rustc.rc *.rs */*.rs */*/*.rs */*/*/*.rs)))
202202

203-
LIBRUSTSYNTAX_CRATE := $(S)src/librustsyntax/rustsyntax.rc
204-
LIBRUSTSYNTAX_INPUTS := $(wildcard $(addprefix $(S)src/librustsyntax/, \
205-
rustsyntax.rc *.rs */*.rs */*/*.rs))
203+
LIBSYNTAX_CRATE := $(S)src/libsyntax/syntax.rc
204+
LIBSYNTAX_INPUTS := $(wildcard $(addprefix $(S)src/libsyntax/, \
205+
syntax.rc *.rs */*.rs */*/*.rs))
206206

207207
RUSTC_INPUTS := $(S)src/rustc/driver/rustc.rs
208208

‎mk/clean.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ clean$(1)_H_$(2):
6161
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_CORELIB)
6262
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_STDLIB)
6363
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTC)
64-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBRUSTSYNTAX)
64+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_LIBSYNTAX)
6565
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CORELIB_GLOB)
6666
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(STDLIB_GLOB)
6767
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTC_GLOB)
68-
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBRUSTSYNTAX_GLOB)
68+
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(LIBSYNTAX_GLOB)
6969
$(Q)rm -f $$(HLIB$(1)_H_$(2))/$(CFG_RUSTLLVM)
7070
$(Q)rm -f $$(HLIB$(1)_H_$(2))/libstd.rlib
7171

@@ -87,11 +87,11 @@ clean$(1)_T_$(2)_H_$(3):
8787
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB)
8888
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB)
8989
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC)
90-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTSYNTAX)
90+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX)
9191
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CORELIB_GLOB)
9292
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(STDLIB_GLOB)
9393
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTC_GLOB)
94-
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBRUSTSYNTAX_GLOB)
94+
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(LIBSYNTAX_GLOB)
9595
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM)
9696
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
9797
$(Q)rm -f $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a

‎mk/dist.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ PKG_FILES := \
2828
etc \
2929
fuzzer \
3030
libcore \
31-
librustsyntax \
31+
libsyntax \
3232
libstd \
3333
rt \
3434
rustdoc \

‎mk/host.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ $$(HBIN$(2)_H_$(4))/rustc$$(X): \
2323

2424
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC): \
2525
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTC) \
26-
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTSYNTAX) \
26+
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX) \
2727
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME) \
2828
$$(HLIB$(2)_H_$(4))/$$(CFG_RUSTLLVM) \
2929
$$(HCORELIB_DEFAULT$(2)_H_$(3)) \
@@ -34,16 +34,16 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC): \
3434
$$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_DSYM_GLOB) \
3535
$$(HLIB$(2)_H_$(4))
3636

37-
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTSYNTAX): \
38-
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTSYNTAX) \
37+
$$(HLIB$(2)_H_$(4))/$$(CFG_LIBSYNTAX): \
38+
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBSYNTAX) \
3939
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME) \
4040
$$(HLIB$(2)_H_$(4))/$$(CFG_RUSTLLVM) \
4141
$$(HCORELIB_DEFAULT$(2)_H_$(3)) \
4242
$$(HSTDLIB_DEFAULT$(2)_H_$(3))
4343
@$$(call E, cp: $$@)
4444
$$(Q)cp $$< $$@
45-
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTSYNTAX_GLOB) \
46-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTSYNTAX_DSYM_GLOB) \
45+
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_GLOB) \
46+
$$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_DSYM_GLOB) \
4747
$$(HLIB$(2)_H_$(4))
4848

4949
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME): \

‎mk/install.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ install-target-$(1)-host-$(2): $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
4343
$$(Q)$$(call INSTALL_LIB, \
4444
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTC_GLOB))
4545
$$(Q)$$(call INSTALL_LIB, \
46-
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBRUSTSYNTAX_GLOB))
46+
$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(LIBSYNTAX_GLOB))
4747
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
4848

4949
endef
@@ -77,7 +77,7 @@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE))
7777
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(CORELIB_GLOB))
7878
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(STDLIB_GLOB))
7979
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTC_GLOB))
80-
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBRUSTSYNTAX_GLOB))
80+
$(Q)$(call INSTALL_LIB,$(HL),$(PHL),$(LIBSYNTAX_GLOB))
8181
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM))
8282
$(Q)$(call INSTALL,$(S)/man, \
8383
$(PREFIX_ROOT)/share/man/man1,rustc.1)
@@ -98,7 +98,7 @@ uninstall:
9898
$(call HOST_LIB_FROM_HL_GLOB,$(CORELIB_GLOB)) \
9999
$(call HOST_LIB_FROM_HL_GLOB,$(STDLIB_GLOB)) \
100100
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTC_GLOB)) \
101-
$(call HOST_LIB_FROM_HL_GLOB,$(LIBRUSTSYNTAX_GLOB)) \
101+
$(call HOST_LIB_FROM_HL_GLOB,$(LIBSYNTAX_GLOB)) \
102102
; \
103103
do rm -f $$i ; \
104104
done

‎mk/target.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ $$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X): \
3232

3333
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTC): \
3434
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
35-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTSYNTAX)
35+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX)
3636
@$$(call E, compile_and_link: $$@)
3737
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< && touch $$@
3838

39-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTSYNTAX): \
40-
$$(LIBRUSTSYNTAX_CRATE) $$(LIBRUSTSYNTAX_INPUTS) \
39+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX): \
40+
$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
4141
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
4242
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_RUSTLLVM) \
4343
$$(TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3)) \

‎mk/tests.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ define TEST_STAGEN
179179
TEST_SREQ$(1)_T_$(2)_H_$(3) = \
180180
$$(HBIN$(1)_H_$(3))/compiletest$$(X) \
181181
$$(HSREQ$(1)_$(2)_$(3)) \
182-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBRUSTSYNTAX)
182+
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_LIBSYNTAX)
183183

184184

185185
check-stage$(1)-T-$(2)-H-$(3): tidy \

‎src/cargo/cargo.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
use core(vers = "0.2");
2323
use std(vers = "0.2");
2424
use rustc(vers = "0.2");
25-
use syntax(name = "rustsyntax", vers = "0.2");
25+
use syntax(vers = "0.2");
2626

2727
import core::*;
2828

‎src/etc/snapshot.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ def scrub(b):
2222
download_dir_base = "dl"
2323
download_unpack_base = os.path.join(download_dir_base, "unpack")
2424

25+
# FIXME: s/librustsyntax/libsyntax/ once the snapshots exist with it
2526
snapshot_files = {
2627
"linux": ["bin/rustc",
2728
"lib/libcore-*.so",

‎src/fuzzer/fuzzer.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
use core(vers = "0.2");
88
use std(vers = "0.2");
9-
use syntax(name = "rustsyntax", vers = "0.2");
9+
use syntax(vers = "0.2");
1010

1111
import core::*;
1212

‎src/librustsyntax/ast.rs renamed to ‎src/libsyntax/ast.rs

File renamed without changes.

‎src/librustsyntax/ast_map.rs renamed to ‎src/libsyntax/ast_map.rs

File renamed without changes.

‎src/librustsyntax/ast_util.rs renamed to ‎src/libsyntax/ast_util.rs

File renamed without changes.

‎src/librustsyntax/attr.rs renamed to ‎src/libsyntax/attr.rs

File renamed without changes.

‎src/librustsyntax/codemap.rs renamed to ‎src/libsyntax/codemap.rs

File renamed without changes.

‎src/librustsyntax/diagnostic.rs renamed to ‎src/libsyntax/diagnostic.rs

File renamed without changes.

‎src/librustsyntax/ext/auto_serialize.rs renamed to ‎src/libsyntax/ext/auto_serialize.rs

File renamed without changes.

‎src/librustsyntax/ext/base.rs renamed to ‎src/libsyntax/ext/base.rs

File renamed without changes.

‎src/librustsyntax/ext/build.rs renamed to ‎src/libsyntax/ext/build.rs

File renamed without changes.

‎src/librustsyntax/ext/concat_idents.rs renamed to ‎src/libsyntax/ext/concat_idents.rs

File renamed without changes.

‎src/librustsyntax/ext/env.rs renamed to ‎src/libsyntax/ext/env.rs

File renamed without changes.

‎src/librustsyntax/ext/expand.rs renamed to ‎src/libsyntax/ext/expand.rs

File renamed without changes.

‎src/librustsyntax/ext/fmt.rs renamed to ‎src/libsyntax/ext/fmt.rs

File renamed without changes.

‎src/librustsyntax/ext/ident_to_str.rs renamed to ‎src/libsyntax/ext/ident_to_str.rs

File renamed without changes.

‎src/librustsyntax/ext/log_syntax.rs renamed to ‎src/libsyntax/ext/log_syntax.rs

File renamed without changes.

‎src/librustsyntax/ext/qquote.rs renamed to ‎src/libsyntax/ext/qquote.rs

File renamed without changes.

‎src/librustsyntax/ext/simplext.rs renamed to ‎src/libsyntax/ext/simplext.rs

File renamed without changes.

‎src/librustsyntax/ext/source_util.rs renamed to ‎src/libsyntax/ext/source_util.rs

File renamed without changes.

‎src/librustsyntax/fold.rs renamed to ‎src/libsyntax/fold.rs

File renamed without changes.

‎src/librustsyntax/parse.rs renamed to ‎src/libsyntax/parse.rs

File renamed without changes.

‎src/librustsyntax/parse/attr.rs renamed to ‎src/libsyntax/parse/attr.rs

File renamed without changes.

‎src/librustsyntax/parse/classify.rs renamed to ‎src/libsyntax/parse/classify.rs

File renamed without changes.

‎src/librustsyntax/parse/comments.rs renamed to ‎src/libsyntax/parse/comments.rs

File renamed without changes.

‎src/librustsyntax/parse/common.rs renamed to ‎src/libsyntax/parse/common.rs

File renamed without changes.

‎src/librustsyntax/parse/eval.rs renamed to ‎src/libsyntax/parse/eval.rs

File renamed without changes.

‎src/librustsyntax/parse/lexer.rs renamed to ‎src/libsyntax/parse/lexer.rs

File renamed without changes.

‎src/librustsyntax/parse/parser.rs renamed to ‎src/libsyntax/parse/parser.rs

File renamed without changes.

‎src/librustsyntax/parse/prec.rs renamed to ‎src/libsyntax/parse/prec.rs

File renamed without changes.

‎src/librustsyntax/parse/token.rs renamed to ‎src/libsyntax/parse/token.rs

File renamed without changes.

‎src/librustsyntax/print/pp.rs renamed to ‎src/libsyntax/print/pp.rs

File renamed without changes.

‎src/librustsyntax/print/pprust.rs renamed to ‎src/libsyntax/print/pprust.rs

File renamed without changes.

‎src/librustsyntax/rustsyntax.rc renamed to ‎src/libsyntax/syntax.rc

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1-
#[link(name = "rustsyntax",
1+
#[link(name = "syntax",
22
vers = "0.2",
3-
uuid = "c2b79dd0-a437-4ec7-95f9-858d77808c2f")];
3+
uuid = "9311401b-d6ea-4cd9-a1d9-61f89499c645")];
4+
5+
46

57
#[crate_type = "lib"];
68

‎src/librustsyntax/util/interner.rs renamed to ‎src/libsyntax/util/interner.rs

File renamed without changes.

‎src/librustsyntax/visit.rs renamed to ‎src/libsyntax/visit.rs

File renamed without changes.

‎src/rustc/driver/rustc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
use core(vers = "0.2");
44
use std(vers = "0.2");
55
use rustc(vers = "0.2");
6-
use syntax(name = "rustsyntax", vers = "0.2");
6+
use syntax(vers = "0.2");
77

88
import core::*;
99

‎src/rustc/metadata/astencode.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ fn decode_inlined_item(cdata: cstore::crate_metadata,
107107
alt ii {
108108
ast::ii_item(i) {
109109
#debug(">>> DECODED ITEM >>>\n%s\n<<< DECODED ITEM <<<",
110-
rustsyntax::print::pprust::item_to_str(i));
110+
syntax::print::pprust::item_to_str(i));
111111
}
112112
_ { }
113113
}

‎src/rustc/rustc.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
use core(vers = "0.2");
1515
use std(vers = "0.2");
16-
use syntax(name = "rustsyntax", vers = "0.2");
16+
use syntax(vers = "0.2");
1717

1818
import core::*;
1919

‎src/rustdoc/rustdoc.rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
use core(vers = "0.2");
1515
use std(vers = "0.2");
1616
use rustc(vers = "0.2");
17-
use syntax(name = "rustsyntax", vers = "0.2");
17+
use syntax(vers = "0.2");
1818

1919
import core::*;
2020

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// xfail-pretty
22

33
use std;
4-
use syntax(name = "rustsyntax");
4+
use syntax;
55

66
import io::*;
77

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// xfail-pretty
22

33
use std;
4-
use syntax(name = "rustsyntax");
4+
use syntax;
55

66
import std::io::*;
77

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// xfail-test
22
// fails pretty printing for some reason
3-
use syntax(name = "rustsyntax");
3+
use syntax;
44
import syntax::diagnostic;
55
import syntax;
66
import syntax::ast;

‎src/test/run-pass/qquote.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// xfail-pretty
22

33
use std;
4-
use syntax(name = "rustsyntax");
4+
use syntax;
55

66
import io::*;
77

0 commit comments

Comments
 (0)