Skip to content

Commit d57e2a2

Browse files
borsbors
committed
---
yaml --- r: 72639 b: refs/heads/dist-snap c: 9a31cdb h: refs/heads/master i: 72637: ea29aab 72635: 5b5028a 72631: 216f27a 72623: d530c7f 72607: 408fdbb 72575: 73a48dd v: v3
1 parent d3e800f commit d57e2a2

File tree

122 files changed

+7819
-1717
lines changed

Some content is hidden

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

122 files changed

+7819
-1717
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
99
refs/heads/incoming: b50030718cf28f2a5a81857a26b57442734fe854
10-
refs/heads/dist-snap: 4dd0fa68766e84499bd1680043b38a34a9fc7606
10+
refs/heads/dist-snap: 9a31cdb9bf9bff6071ab972808c7e50e216cf5b0
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

‎branches/dist-snap/Makefile.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ $(foreach target,$(CFG_TARGET_TRIPLES),\
238238

239239
CORELIB_CRATE := $(S)src/libcore/core.rc
240240
CORELIB_INPUTS := $(wildcard $(addprefix $(S)src/libcore/, \
241-
core.rc *.rs */*.rs */*/*rs))
241+
core.rc *.rs */*.rs */*/*rs */*/*/*rs))
242242

243243
######################################################################
244244
# Standard library variables

‎branches/dist-snap/mk/docs.mk

Lines changed: 35 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,8 @@ DOCS :=
1616

1717

1818
######################################################################
19-
# Pandoc (reference-manual related)
19+
# Docs, from pandoc, rustdoc (which runs pandoc), and node
2020
######################################################################
21-
ifeq ($(CFG_PANDOC),)
22-
$(info cfg: no pandoc found, omitting doc/rust.pdf)
23-
else
24-
25-
ifeq ($(CFG_NODE),)
26-
$(info cfg: no node found, omitting doc/tutorial.html)
27-
else
2821

2922
doc/rust.css: rust.css
3023
@$(call E, cp: $@)
@@ -34,6 +27,18 @@ doc/manual.css: manual.css
3427
@$(call E, cp: $@)
3528
$(Q)cp -a $< $@ 2> /dev/null
3629

30+
ifeq ($(CFG_PANDOC),)
31+
$(info cfg: no pandoc found, omitting docs)
32+
NO_DOCS = 1
33+
endif
34+
35+
ifeq ($(CFG_NODE),)
36+
$(info cfg: no node found, omitting docs)
37+
NO_DOCS = 1
38+
endif
39+
40+
ifneq ($(NO_DOCS),1)
41+
3742
DOCS += doc/rust.html
3843
doc/rust.html: rust.md doc/version_info.html doc/rust.css doc/manual.css
3944
@$(call E, pandoc: $@)
@@ -47,19 +52,8 @@ doc/rust.html: rust.md doc/version_info.html doc/rust.css doc/manual.css
4752
--css=manual.css \
4853
--include-before-body=doc/version_info.html \
4954
--output=$@
50-
endif
5155

52-
ifeq ($(CFG_PDFLATEX),)
53-
$(info cfg: no pdflatex found, omitting doc/rust.pdf)
54-
else
55-
ifeq ($(CFG_XETEX),)
56-
$(info cfg: no xetex found, disabling doc/rust.pdf)
57-
else
58-
ifeq ($(CFG_LUATEX),)
59-
$(info cfg: lacking luatex, disabling pdflatex)
60-
else
61-
62-
DOCS += doc/rust.pdf
56+
DOCS += doc/rust.tex
6357
doc/rust.tex: rust.md doc/version.md
6458
@$(call E, pandoc: $@)
6559
$(Q)$(CFG_NODE) $(S)doc/prep.js $< | \
@@ -70,17 +64,6 @@ doc/rust.tex: rust.md doc/version.md
7064
--from=markdown --to=latex \
7165
--output=$@
7266

73-
doc/rust.pdf: doc/rust.tex
74-
@$(call E, pdflatex: $@)
75-
$(Q)$(CFG_PDFLATEX) \
76-
-interaction=batchmode \
77-
-output-directory=doc \
78-
$<
79-
80-
endif
81-
endif
82-
endif
83-
8467
DOCS += doc/rustpkg.html
8568
doc/rustpkg.html: rustpkg.md doc/version_info.html doc/rust.css doc/manual.css
8669
@$(call E, pandoc: $@)
@@ -95,13 +78,6 @@ doc/rustpkg.html: rustpkg.md doc/version_info.html doc/rust.css doc/manual.css
9578
--include-before-body=doc/version_info.html \
9679
--output=$@
9780

98-
######################################################################
99-
# Node (tutorial related)
100-
######################################################################
101-
ifeq ($(CFG_NODE),)
102-
$(info cfg: no node found, omitting doc/tutorial.html)
103-
else
104-
10581
DOCS += doc/tutorial.html
10682
doc/tutorial.html: tutorial.md doc/version_info.html doc/rust.css
10783
@$(call E, pandoc: $@)
@@ -153,9 +129,29 @@ doc/tutorial-tasks.html: tutorial-tasks.md doc/version_info.html doc/rust.css
153129
--include-before-body=doc/version_info.html \
154130
--output=$@
155131

132+
ifeq ($(CFG_PDFLATEX),)
133+
$(info cfg: no pdflatex found, omitting doc/rust.pdf)
134+
else
135+
ifeq ($(CFG_XETEX),)
136+
$(info cfg: no xetex found, disabling doc/rust.pdf)
137+
else
138+
ifeq ($(CFG_LUATEX),)
139+
$(info cfg: lacking luatex, disabling pdflatex)
140+
else
141+
142+
DOCS += doc/rust.pdf
143+
doc/rust.pdf: doc/rust.tex
144+
@$(call E, pdflatex: $@)
145+
$(Q)$(CFG_PDFLATEX) \
146+
-interaction=batchmode \
147+
-output-directory=doc \
148+
$<
149+
150+
endif
151+
endif
156152
endif
157-
endif
158153

154+
endif # No pandoc / node
159155

160156
######################################################################
161157
# LLnextgen (grammar analysis from refman)

‎branches/dist-snap/mk/host.mk

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,7 @@ $$(HBIN$(2)_H_$(4))/rustc$$(X_$(4)): \
2929
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
3030
$$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)) \
3131
$$(HCORELIB_DEFAULT$(2)_H_$(4)) \
32-
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
33-
| $$(HBIN$(2)_H_$(4))/
34-
32+
$$(HSTDLIB_DEFAULT$(2)_H_$(4))
3533
@$$(call E, cp: $$@)
3634
$$(Q)cp $$< $$@
3735

@@ -41,9 +39,7 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBRUSTC_$(4)): \
4139
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
4240
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
4341
$$(HCORELIB_DEFAULT$(2)_H_$(4)) \
44-
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
45-
| $$(HBIN$(2)_H_$(4))/
46-
42+
$$(HSTDLIB_DEFAULT$(2)_H_$(4))
4743
@$$(call E, cp: $$@)
4844
$$(Q)cp $$< $$@
4945
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBRUSTC_GLOB_$(4)) \
@@ -55,24 +51,21 @@ $$(HLIB$(2)_H_$(4))/$(CFG_LIBSYNTAX_$(4)): \
5551
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
5652
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)) \
5753
$$(HCORELIB_DEFAULT$(2)_H_$(4)) \
58-
$$(HSTDLIB_DEFAULT$(2)_H_$(4)) \
59-
| $$(HBIN$(2)_H_$(4))/
54+
$$(HSTDLIB_DEFAULT$(2)_H_$(4))
6055
@$$(call E, cp: $$@)
6156
$$(Q)cp $$< $$@
6257
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_GLOB_$(4)) \
6358
$$(wildcard $$(TLIB$(1)_T_$(4)_H_$(3))/$(LIBSYNTAX_DSYM_GLOB_$(4))) \
6459
$$(HLIB$(2)_H_$(4))
6560

6661
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)): \
67-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_RUNTIME_$(4)) \
68-
| $$(HBIN$(2)_H_$(4))/
62+
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_RUNTIME_$(4))
6963
@$$(call E, cp: $$@)
7064
$$(Q)cp $$< $$@
7165

7266
$$(HLIB$(2)_H_$(4))/$(CFG_CORELIB_$(4)): \
7367
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_CORELIB_$(4)) \
74-
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
75-
| $$(HBIN$(2)_H_$(4))/
68+
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4))
7669
@$$(call E, cp: $$@)
7770
$$(Q)cp $$< $$@
7871
# Subtle: We do not let the shell expand $(CORELIB_DSYM_GLOB) directly rather
@@ -89,8 +82,7 @@ $$(HLIB$(2)_H_$(4))/$(CFG_CORELIB_$(4)): \
8982
$$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)): \
9083
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_STDLIB_$(4)) \
9184
$$(HLIB$(2)_H_$(4))/$(CFG_CORELIB_$(4)) \
92-
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4)) \
93-
| $$(HBIN$(2)_H_$(4))/
85+
$$(HLIB$(2)_H_$(4))/$(CFG_RUNTIME_$(4))
9486
@$$(call E, cp: $$@)
9587
$$(Q)cp $$< $$@
9688
$$(Q)cp -R $$(TLIB$(1)_T_$(4)_H_$(3))/$(STDLIB_GLOB_$(4)) \
@@ -99,37 +91,30 @@ $$(HLIB$(2)_H_$(4))/$(CFG_STDLIB_$(4)): \
9991

10092
$$(HLIB$(2)_H_$(4))/libcore.rlib: \
10193
$$(TLIB$(1)_T_$(4)_H_$(3))/libcore.rlib \
102-
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
103-
| $$(HBIN$(2)_H_$(4))/
94+
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4))
10495
@$$(call E, cp: $$@)
10596
$$(Q)cp $$< $$@
10697

10798
$$(HLIB$(2)_H_$(4))/libstd.rlib: \
10899
$$(TLIB$(1)_T_$(4)_H_$(3))/libstd.rlib \
109100
$$(HLIB$(2)_H_$(4))/libcore.rlib \
110-
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
111-
| $$(HBIN$(2)_H_$(4))/
101+
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4))
112102
@$$(call E, cp: $$@)
113103
$$(Q)cp $$< $$@
114104

115105
$$(HLIB$(2)_H_$(4))/librustc.rlib: \
116106
$$(TLIB$(1)_T_$(4)_H_$(3))/librustc.rlib \
117107
$$(HLIB$(2)_H_$(4))/libcore.rlib \
118108
$$(HLIB$(2)_H_$(4))/libstd.rlib \
119-
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4)) \
120-
| $$(HBIN$(2)_H_$(4))/
109+
$$(HLIB$(2)_H_$(4))/$$(CFG_RUNTIME_$(4))
121110
@$$(call E, cp: $$@)
122111
$$(Q)cp $$< $$@
123112

124113
$$(HLIB$(2)_H_$(4))/$(CFG_RUSTLLVM_$(4)): \
125-
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_RUSTLLVM_$(4)) \
126-
| $$(HBIN$(2)_H_$(4))/
114+
$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_RUSTLLVM_$(4))
127115
@$$(call E, cp: $$@)
128116
$$(Q)cp $$< $$@
129117

130-
$$(HBIN$(2)_H_$(4))/:
131-
mkdir -p $@
132-
133118
endef
134119

135120
$(foreach t,$(CFG_HOST_TRIPLES), \

‎branches/dist-snap/mk/rt.mk

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,16 @@ endif
163163
ifdef CFG_WINDOWSY_$(1)
164164
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
165165
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
166+
CFLAGS="$$(CFG_GCCISH_CFLAGS)" \
167+
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS)" \
166168
builddir_name="$$(CFG_BUILD_DIR)/rt/$(1)/libuv" \
167169
OS=mingw \
168170
V=$$(VERBOSE)
169171
else ifeq ($(OSTYPE_$(1)), linux-androideabi)
170172
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
171173
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
172-
CFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
173-
LDFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1)))" \
174+
CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
175+
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \
174176
CC="$$(CC_$(1))" \
175177
CXX="$$(CXX_$(1))" \
176178
AR="$$(AR_$(1))" \
@@ -181,8 +183,8 @@ $$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
181183
else
182184
$$(LIBUV_LIB_$(1)): $$(LIBUV_DEPS)
183185
$$(Q)$$(MAKE) -C $$(S)src/libuv/ \
184-
CFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
185-
LDFLAGS="$$(LIBUV_FLAGS_$$(HOST_$(1)))" \
186+
CFLAGS="$$(CFG_GCCISH_CFLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1))) $$(SNAP_DEFINES)" \
187+
LDFLAGS="$$(CFG_GCCISH_LINK_FLAGS) $$(LIBUV_FLAGS_$$(HOST_$(1)))" \
186188
CC="$$(CC_$(1))" \
187189
CXX="$$(CXX_$(1))" \
188190
AR="$$(AR_$(1))" \

‎branches/dist-snap/mk/target.mk

Lines changed: 9 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,62 +18,54 @@
1818
define TARGET_STAGE_N
1919

2020
$$(TLIB$(1)_T_$(2)_H_$(3))/libmorestack.a: \
21-
rt/$(2)/arch/$$(HOST_$(2))/libmorestack.a \
22-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
21+
rt/$(2)/arch/$$(HOST_$(2))/libmorestack.a
2322
@$$(call E, cp: $$@)
2423
$$(Q)cp $$< $$@
2524

2625
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUNTIME_$(2)): \
27-
rt/$(2)/$(CFG_RUNTIME_$(2)) \
28-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
26+
rt/$(2)/$(CFG_RUNTIME_$(2))
2927
@$$(call E, cp: $$@)
3028
$$(Q)cp $$< $$@
3129

3230
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2)): \
3331
$$(CORELIB_CRATE) $$(CORELIB_INPUTS) \
34-
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
35-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
32+
$$(TSREQ$(1)_T_$(2)_H_$(3))
3633
@$$(call E, compile_and_link: $$@)
3734
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< && touch $$@
3835

3936
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_STDLIB_$(2)): \
4037
$$(STDLIB_CRATE) $$(STDLIB_INPUTS) \
4138
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_CORELIB_$(2)) \
42-
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
43-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
39+
$$(TSREQ$(1)_T_$(2)_H_$(3))
4440
@$$(call E, compile_and_link: $$@)
4541
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< && touch $$@
4642

4743
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)): \
4844
$$(LIBSYNTAX_CRATE) $$(LIBSYNTAX_INPUTS) \
4945
$$(TSREQ$(1)_T_$(2)_H_$(3)) \
5046
$$(TCORELIB_DEFAULT$(1)_T_$(2)_H_$(3)) \
51-
$$(TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3)) \
52-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
47+
$$(TSTDLIB_DEFAULT$(1)_T_$(2)_H_$(3))
5348
@$$(call E, compile_and_link: $$@)
5449
$$(STAGE$(1)_T_$(2)_H_$(3)) $(BORROWCK) -o $$@ $$< && touch $$@
5550

5651
# Only build the compiler for host triples
5752
ifneq ($$(findstring $(2),$$(CFG_HOST_TRIPLES)),)
5853

5954
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3)): \
60-
rustllvm/$(2)/$(CFG_RUSTLLVM_$(3)) \
61-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
55+
rustllvm/$(2)/$(CFG_RUSTLLVM_$(3))
6256
@$$(call E, cp: $$@)
6357
$$(Q)cp $$< $$@
6458

6559
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)): \
6660
$$(COMPILER_CRATE) $$(COMPILER_INPUTS) \
6761
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBSYNTAX_$(3)) \
68-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3)) \
69-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
62+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_RUSTLLVM_$(3))
7063
@$$(call E, compile_and_link: $$@)
7164
$$(STAGE$(1)_T_$(2)_H_$(3)) -o $$@ $$< && touch $$@
7265

7366
$$(TBIN$(1)_T_$(2)_H_$(3))/rustc$$(X_$(3)): \
74-
$$(DRIVER_CRATE) \
75-
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3)) \
76-
| $$(TLIB$(1)_T_$(2)_H_$(3))/
67+
$$(DRIVER_CRATE) \
68+
$$(TLIB$(1)_T_$(2)_H_$(3))/$(CFG_LIBRUSTC_$(3))
7769
@$$(call E, compile_and_link: $$@)
7870
$$(STAGE$(1)_T_$(2)_H_$(3)) --cfg rustc -o $$@ $$<
7971
ifdef CFG_ENABLE_PAX_FLAGS
@@ -83,9 +75,6 @@ endif
8375

8476
endif
8577

86-
$$(TLIB$(1)_T_$(2)_H_$(3))/:
87-
mkdir -p $@
88-
8978
endef
9079

9180
# In principle, each host can build each target:

‎branches/dist-snap/src/etc/unicode.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,10 @@ def emit_decomp_module(f, canon, compat):
235235
rf = open(r, "w")
236236

237237
(canon_decomp, compat_decomp, gencats) = load_unicode_data("UnicodeData.txt")
238+
239+
# Explain that the source code was generated by this script.
240+
rf.write('// The following code was generated by "src/etc/unicode.py"\n\n')
241+
238242
emit_property_module(rf, "general_category", gencats)
239243

240244
#emit_decomp_module(rf, canon_decomp, compat_decomp)

‎branches/dist-snap/src/libcore/bool.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,6 @@ mod tests {
108108

109109
#[test]
110110
fn test_bool_from_str() {
111-
use from_str::FromStr;
112-
113111
do all_values |v| {
114112
assert!(Some(v) == FromStr::from_str(to_str(v)))
115113
}

‎branches/dist-snap/src/libcore/cast.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010

1111
//! Unsafe casting functions
1212
13+
#[cfg(not(stage0))]
1314
use sys;
15+
#[cfg(not(stage0))]
1416
use unstable;
1517

1618
pub mod rusti {

0 commit comments

Comments
 (0)