Skip to content

Commit 27c1fe6

Browse files
nikomatsakisnikomatsakis
committed
---
yaml --- r: 6590 b: refs/heads/master c: 7bf4139 h: refs/heads/master v: v3
1 parent ed17967 commit 27c1fe6

Some content is hidden

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

102 files changed

+160
-740
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
---
2-
refs/heads/master: 1652b921fa2fadc936b346fc3de217cf97b0e476
2+
refs/heads/master: 7bf41392b62f8e118ac21842804808c516b953b0

‎trunk/Makefile.in

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,6 @@ endif
104104

105105
CFG_RUNTIME :=$(call CFG_LIB_NAME,rustrt)
106106
CFG_RUSTLLVM :=$(call CFG_LIB_NAME,rustllvm)
107-
CFG_CORELIB :=$(call CFG_LIB_NAME,core)
108107
CFG_STDLIB :=$(call CFG_LIB_NAME,ruststd)
109108
CFG_LIBRUSTC :=$(call CFG_LIB_NAME,rustc)
110109

@@ -145,9 +144,9 @@ else
145144
endif
146145

147146
ifeq ($(CFG_NATURALDOCS),)
148-
$(info cfg: no naturaldocs found, omitting library doc build)
147+
$(info cfg: no naturaldocs found, omitting doc/std/index.html)
149148
else
150-
DOCS += doc/core/index.html doc/std/index.html
149+
DOCS += doc/std/index.html
151150
endif
152151

153152
ifdef CFG_DISABLE_DOCS
@@ -184,21 +183,12 @@ GENERATED :=
184183
%:: s.%
185184
%:: SCCS/s.%
186185

187-
######################################################################
188-
# Core library variables
189-
######################################################################
190-
191-
CORELIB_CRATE := $(S)src/libcore/core.rc
192-
CORELIB_INPUTS := $(wildcard $(addprefix $(S)src/libcore/, \
193-
core.rc *.rs */*.rs))
194-
195186
######################################################################
196187
# Standard library variables
197188
######################################################################
198189

199-
STDLIB_CRATE := $(S)src/libstd/std.rc
200-
STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/libstd/, \
201-
std.rc *.rs */*.rs))
190+
STDLIB_CRATE := $(S)src/lib/std.rc
191+
STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/lib/,*.rc *.rs */*.rs))
202192

203193
######################################################################
204194
# rustc crate variables
@@ -278,21 +268,13 @@ TROOT$(1)_T_$(2)_H_$(3) = $$(HLIB$(1)_H_$(3))/rustc/$(2)
278268
TBIN$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/bin
279269
TLIB$(1)_T_$(2)_H_$(3) = $$(TROOT$(1)_T_$(2)_H_$(3))/lib
280270

281-
# The name of the core and standard libraries used by rustc
271+
# The name of the standard library used by rustc
282272
ifdef CFG_DISABLE_SHAREDSTD
283-
HCORELIB_DEFAULT$(1)_H_$(3) = \
284-
$$(HLIB$(1)_H_$(3))/libcore.rlib
285-
TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
286-
$$(TLIB$(1)_T_$(2)_H_$(3))/libcore.rlib
287273
HSTDLIB_DEFAULT$(1)_H_$(3) = \
288274
$$(HLIB$(1)_H_$(3))/libstd.rlib
289275
TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
290276
$$(TLIB$(1)_T_$(2)_H_$(3))/libstd.rlib
291277
else
292-
HCORELIB_DEFAULT$(1)_H_$(3) = \
293-
$$(HLIB$(1)_H_$(3))/$(CFG_CORELIB)
294-
TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
295-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB)
296278
HSTDLIB_DEFAULT$(1)_H_$(3) = \
297279
$$(HLIB$(1)_H_$(3))/$(CFG_STDLIB)
298280
TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3) = \
@@ -304,7 +286,6 @@ HSREQ$(1)_H_$(3) = \
304286
$$(HBIN$(1)_H_$(3))/rustc$$(X) \
305287
$$(HLIB$(1)_H_$(3))/$$(CFG_RUNTIME) \
306288
$$(HLIB$(1)_H_$(3))/$$(CFG_RUSTLLVM) \
307-
$$(HCORELIB_DEFAULT$(1)_H_$(3)) \
308289
$$(HSTDLIB_DEFAULT$(1)_H_$(3)) \
309290
$$(MKFILE_DEPS)
310291

@@ -318,7 +299,6 @@ TSREQ$(1)_T_$(2)_H_$(3) = \
318299
# Prerequisites for complete stageN targets
319300
SREQ$(1)_T_$(2)_H_$(3) = \
320301
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
321-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB) \
322302
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB)
323303

324304
ifeq ($(1),0)

‎trunk/configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -355,8 +355,8 @@ fi
355355
step_msg "making directories"
356356

357357
for i in \
358-
doc doc/core doc/std \
359-
nd nd/core nd/std \
358+
doc doc/std \
359+
nd nd/std \
360360
dl tmp
361361
do
362362
make_dir $i

‎trunk/doc/Languages.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ Language: Rust
120120
Block Comment: /* */
121121
Package Separator: ::
122122
Function Prototype Enders: ; {
123-
Predicate Prototype Enders: ; {
124123
Type Prototype Enders: ; }
125124
Class Prototype Enders: {
126125
Variant Prototype Enders: ;

‎trunk/doc/lib.css

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎trunk/doc/std.css

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
/*
2+
Custom styles for the standard library docs generated by naturaldocs
3+
*/
4+
5+
p {
6+
text-indent: 0;
7+
margin-bottom: 1em;
8+
}

‎trunk/mk/dist.mk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ PKG_FILES = \
4646
$(PKG_3RDPARTY)) \
4747
$(PKG_UV) \
4848
$(COMPILER_INPUTS) \
49-
$(CORELIB_INPUTS) \
5049
$(STDLIB_INPUTS) \
5150
$(ALL_TEST_INPUTS) \
5251
$(FUZZER_CRATE) \

‎trunk/mk/docs.mk

Lines changed: 16 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -29,25 +29,19 @@ docsnap: doc/rust.pdf
2929
@$(call E, snap: doc/rust-$(shell date +"%Y-%m-%d")-snap.pdf)
3030
$(Q)mv $< doc/rust-$(shell date +"%Y-%m-%d")-snap.pdf
3131

32-
define libdoc
33-
doc/$(1)/index.html: nd/$(1)/Languages.txt nd/$(1)/Topics.txt \
34-
nd/$(1)/lib.css $(2)
35-
@$$(call E, naturaldocs: $$@)
36-
naturaldocs -i $(S)src/lib$(1) -o HTML doc/$(1) -p nd/$(1) -r -s Default lib
37-
38-
nd/$(1)/Languages.txt: $(S)doc/Languages.txt
39-
@$$(call E, cp: $$@)
40-
$(Q)cp $$< $$@
41-
42-
nd/$(1)/Topics.txt: $(S)doc/Topics.txt
43-
@$$(call E, cp: $$@)
44-
$(Q)cp $$< $$@
45-
46-
nd/$(1)/lib.css: $(S)doc/lib.css
47-
@$$(call E, cp: $$@)
48-
$(Q)cp $$< $$@
49-
50-
endef
51-
52-
$(eval $(call libdoc,core,$(CORELIB_CRATE) $(CORELIB_INPUTS)))
53-
$(eval $(call libdoc,std,$(STDLIB_CRATE) $(STDLIB_INPUTS)))
32+
doc/std/index.html: nd/std/Languages.txt nd/std/Topics.txt nd/std/std.css \
33+
$(STDLIB_CRATE) $(STDLIB_INPUTS)
34+
@$(call E, naturaldocs: $@)
35+
naturaldocs -i $(S)src/lib -o HTML doc/std -p nd/std -r -s Default std
36+
37+
nd/std/Languages.txt: $(S)doc/Languages.txt
38+
@$(call E, cp: $@)
39+
$(Q)cp $< $@
40+
41+
nd/std/Topics.txt: $(S)doc/Topics.txt
42+
@$(call E, cp: $@)
43+
$(Q)cp $< $@
44+
45+
nd/std/std.css: $(S)doc/std.css
46+
@$(call E, cp: $@)
47+
$(Q)cp $< $@

‎trunk/mk/host.mk

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ $$(HBIN$(2)_H_$(4))/rustc$$(X): \
1515
$$(TBIN$(1)_T_$(4)_H_$(3))/rustc$$(X) \
1616
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME) \
1717
$$(HLIB$(2)_H_$(4))/$$(CFG_RUSTLLVM) \
18-
$$(HCORELIB_DEFAULT$(2)_H_$(4)) \
1918
$$(HSTDLIB_DEFAULT$(2)_H_$(4))
2019
@$$(call E, cp: $$@)
2120
$$(Q)cp $$< $$@
@@ -26,7 +25,6 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_LIBRUSTC): \
2625
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTC) \
2726
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME) \
2827
$$(HLIB$(2)_H_$(4))/$$(CFG_RUSTLLVM) \
29-
$$(HCORELIB_DEFAULT$(2)_H_$(3)) \
3028
$$(HSTDLIB_DEFAULT$(2)_H_$(3))
3129
@$$(call E, cp: $$@)
3230
$$(Q)cp $$< $$@
@@ -36,28 +34,14 @@ $$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME): \
3634
@$$(call E, cp: $$@)
3735
$$(Q)cp $$< $$@
3836

39-
$$(HLIB$(2)_H_$(4))/$$(CFG_CORELIB): \
40-
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_CORELIB) \
41-
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME)
42-
@$$(call E, cp: $$@)
43-
$$(Q)cp $$< $$@
44-
4537
$$(HLIB$(2)_H_$(4))/$$(CFG_STDLIB): \
4638
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_STDLIB) \
47-
$$(HLIB$(2)_H_$(4))/$$(CFG_CORELIB) \
48-
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME)
49-
@$$(call E, cp: $$@)
50-
$$(Q)cp $$< $$@
51-
52-
$$(HLIB$(2)_H_$(4))/libcore.rlib: \
53-
$$(TLIB$(1)_T_$(4)_H_$(3))/libcore.rlib \
5439
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME)
5540
@$$(call E, cp: $$@)
5641
$$(Q)cp $$< $$@
5742

5843
$$(HLIB$(2)_H_$(4))/libstd.rlib: \
5944
$$(TLIB$(1)_T_$(4)_H_$(3))/libstd.rlib \
60-
$$(HLIB$(2)_H_$(4))/libcore.rlib \
6145
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME)
6246
@$$(call E, cp: $$@)
6347
$$(Q)cp $$< $$@

‎trunk/mk/install.mk

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ PTL$(1)$(2) = $$(PTR$(1)$(2))/lib
3333
install-target-$(1)-host-$(2): $$(SREQ$$(ISTAGE)_T_$(1)_H_$(2))
3434
$$(Q)mkdir -p $$(PTL$(1)$(2))
3535
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_RUNTIME))
36-
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_CORELIB))
3736
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),$$(CFG_STDLIB))
3837
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),intrinsics.bc)
3938
$$(Q)$$(call INSTALL,$$(TL$(1)$(2)),$$(PTL$(1)$(2)),libmorestack.a)
@@ -62,7 +61,6 @@ install-host: $(SREQ$(ISTAGE)_T_$(CFG_HOST_TRIPLE)_H_$(CFG_HOST_TRIPLE))
6261
$(Q)mkdir -p $(PREFIX_ROOT)/share/man/man1
6362
$(Q)$(call INSTALL,$(HB),$(PHB),rustc$(X))
6463
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUNTIME))
65-
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_CORELIB))
6664
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_STDLIB))
6765
$(Q)$(call INSTALL,$(HL),$(PHL),$(CFG_RUSTLLVM))
6866
$(Q)$(call INSTALL,$(S)/man, \

‎trunk/mk/platform.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ CFG_GCCISH_LINK_FLAGS :=
1717
# embedded into the executable, so use a no-op command.
1818
CFG_DSYMUTIL := true
1919

20-
ifeq ($(CFG_VALGRIND),)
21-
CFG_GCCISH_CFLAGS += -DNVALGRIND
20+
ifneq ($(CFG_VALGRIND),)
21+
CFG_GCCISH_CFLAGS += -DHAVE_VALGRIND
2222
endif
2323

2424
ifneq ($(findstring freebsd,$(CFG_OSTYPE)),)

‎trunk/mk/pp.mk

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@
22
ifdef PPFILES
33
PP_INPUTS_FILTERED := $(wildcard $(PPFILES))
44
else
5-
PP_INPUTS = $(wildcard $(addprefix $(S)src/libcore/,*.rs */*.rs)) \
6-
$(wildcard $(addprefix $(S)src/libstd/,*.rs */*.rs)) \
5+
PP_INPUTS = $(wildcard $(addprefix $(S)src/lib/,*.rs */*.rs)) \
76
$(wildcard $(addprefix $(S)src/comp/,*.rs */*.rs */*/*.rs)) \
87
$(wildcard $(S)src/test/*/*.rs \
98
$(S)src/test/*/*/*.rs) \

‎trunk/mk/rt.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ else
125125
endif
126126

127127
RUNTIME_DEF_$(1) := rt/rustrt$$(CFG_DEF_SUFFIX)
128-
RUNTIME_INCS_$(1) := -I $$(S)src/rt -I $$(S)src/rt/isaac -I $$(S)src/rt/uthash \
128+
RUNTIME_INCS_$(1) := -I $$(S)src/rt/isaac -I $$(S)src/rt/uthash \
129129
-I $$(S)src/rt/arch/$$(HOST_$(1)) \
130130
-I $$(S)src/libuv/include
131131
RUNTIME_OBJS_$(1) := $$(RUNTIME_CS_$(1):rt/%.cpp=rt/$(1)/%.o) \

‎trunk/mk/stage0.mk

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ $(HLIB0_H_$(CFG_HOST_TRIPLE))/$(CFG_RUNTIME): \
1313
$(HBIN0_H_$(CFG_HOST_TRIPLE))/rustc$(X)
1414
$(Q)touch $@
1515

16-
$(HLIB0_H_$(CFG_HOST_TRIPLE))/$(CFG_CORELIB): \
17-
$(HBIN0_H_$(CFG_HOST_TRIPLE))/rustc$(X)
18-
$(Q)touch $@
19-
2016
$(HLIB0_H_$(CFG_HOST_TRIPLE))/$(CFG_STDLIB): \
2117
$(HBIN0_H_$(CFG_HOST_TRIPLE))/rustc$(X)
2218
$(Q)touch $@
@@ -42,11 +38,6 @@ $$(HLIB0_H_$(1))/$$(CFG_RUNTIME): \
4238
@$$(call E, cp: $$@)
4339
$$(Q)cp $$< $$@
4440

45-
$$(HLIB0_H_$(1))/$(CFG_CORELIB): \
46-
$$(TLIB$(2)_T_$(1)_H_$(3))/$$(CFG_CORELIB)
47-
@$$(call E, cp: $$@)
48-
$$(Q)cp $$< $$@
49-
5041
$$(HLIB0_H_$(1))/$(CFG_STDLIB): \
5142
$$(TLIB$(2)_T_$(1)_H_$(3))/$$(CFG_STDLIB)
5243
@$$(call E, cp: $$@)

‎trunk/mk/target.mk

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,8 @@ $$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a: \
2222
@$$(call E, cp: $$@)
2323
$$(Q)cp $$< $$@
2424

25-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB): \
26-
$$(CORELIB_CRATE) $$(CORELIB_INPUTS) \
27-
$$(TSREQ$(1)_T_$(2)_H_$(3))
28-
@$$(call E, compile_and_link: $$@)
29-
$$(STAGE$(1)_T_$(2)_H_$(3)) --lib -o $$@ $$<
30-
3125
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_STDLIB): \
3226
$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
33-
$$(TLIB$(1)_T_$(2)_H_$(3))/$$(CFG_CORELIB) \
3427
$$(TSREQ$(1)_T_$(2)_H_$(3))
3528
@$$(call E, compile_and_link: $$@)
3629
$$(STAGE$(1)_T_$(2)_H_$(3)) --lib -o $$@ $$<

‎trunk/mk/tests.mk

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ tidy:
8787
$(wildcard $(S)src/etc/*.py) \
8888
$(COMPILER_CRATE) \
8989
$(COMPILER_INPUTS) \
90-
$(CORELIB_CRATE) \
91-
$(CORELIB_INPUTS) \
9290
$(STDLIB_CRATE) \
9391
$(STDLIB_INPUTS) \
9492
$(COMPILETEST_CRATE) \
@@ -477,4 +475,4 @@ endef
477475
$(foreach stage,$(STAGES), \
478476
$(eval $(call DEF_CHECK_FOR_STAGE,$(stage))))
479477

480-
check-fast: check-fast-H-$(CFG_HOST_TRIPLE)
478+
check-fast: check-fast-H-$(CFG_HOST_TRIPLE)

‎trunk/mk/tools.mk

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ define TOOLS_STAGE_N
1919
$$(TBIN$(1)_T_$(4)_H_$(3))/fuzzer$$(X): \
2020
$$(FUZZER_CRATE) $$(FUZZER_INPUTS) \
2121
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
22-
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_CORELIB) \
2322
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_STDLIB) \
2423
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTC)
2524
@$$(call E, compile_and_link: $$@)
@@ -38,7 +37,6 @@ $$(HBIN$(2)_H_$(4))/fuzzer$$(X): \
3837
$$(TBIN$(1)_T_$(4)_H_$(3))/compiletest$$(X): \
3938
$$(COMPILETEST_CRATE) $$(COMPILETEST_INPUTS) \
4039
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
41-
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_CORELIB) \
4240
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_STDLIB)
4341
@$$(call E, compile_and_link: $$@)
4442
$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$<
@@ -52,7 +50,6 @@ $$(HBIN$(2)_H_$(4))/compiletest$$(X): \
5250
$$(TBIN$(1)_T_$(4)_H_$(3))/cargo$$(X): \
5351
$$(CARGO_CRATE) $$(CARGO_INPUTS) \
5452
$$(TSREQ$(1)_T_$(4)_H_$(3)) \
55-
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_CORELIB) \
5653
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_STDLIB) \
5754
$$(TLIB$(1)_T_$(4)_H_$(3))/$$(CFG_LIBRUSTC)
5855
@$$(call E, compile_and_link: $$@)

0 commit comments

Comments
 (0)