Skip to content

Commit 6907520

Browse files
dotdashdotdash
committed
---
yaml --- r: 59317 b: refs/heads/snap-stage3 c: e5ca35d h: refs/heads/master i: 59315: 262cfd5 v: v3
1 parent 915df5e commit 6907520

File tree

558 files changed

+8598
-2539
lines changed

Some content is hidden

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

558 files changed

+8598
-2539
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: c081ffbd1e845687202a975ea2e698b623e5722f
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 175a5eea420af5f23c356da7def52d82903bceed
4+
refs/heads/snap-stage3: e5ca35d567e7d243c81d8c41fa0e7268ae8df58f
55
refs/heads/try: c50a9d5b664478e533ba1d1d353213d70c8ad589
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

‎branches/snap-stage3/.gitattributes

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[attr]rust text eol=lf whitespace=tab-in-indent,trailing-space,tabwidth=4
2+
3+
* text=auto
4+
*.cpp rust
5+
*.h rust
6+
*.rs rust
7+
src/rt/msvc/* -whitespace
8+
src/rt/vg/* -whitespace
9+
src/rt/linenoise/* -whitespace

‎branches/snap-stage3/COPYRIGHT

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -367,4 +367,3 @@ their own copyright notices and license terms:
367367
has chosen for the collective work, enumerated at the top
368368
of this file. The only difference is the retention of
369369
copyright itself, held by the contributor.
370-

‎branches/snap-stage3/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/snap-stage3/RELEASES.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ Version 0.3 (July 2012)
250250
* Slices and fixed-size, interior-allocated vectors
251251
* #!-comments for lang versioning, shell execution
252252
* Destructors and iface implementation for classes;
253-
type-parameterized classes and class methods
253+
type-parameterized classes and class methods
254254
* 'const' type kind for types that can be used to implement
255255
shared-memory concurrency patterns
256256

@@ -261,7 +261,7 @@ Version 0.3 (July 2012)
261261
'crust', 'native' (now 'extern'), 'cont' (now 'again')
262262

263263
* Constructs: do-while loops ('do' repurposed), fn binding,
264-
resources (replaced by destructors)
264+
resources (replaced by destructors)
265265

266266
* Compiler reorganization
267267
* Syntax-layer of compiler split into separate crate
@@ -276,7 +276,7 @@ Version 0.3 (July 2012)
276276
* Extensive work on libuv interface
277277
* Much vector code moved to libraries
278278
* Syntax extensions: #line, #col, #file, #mod, #stringify,
279-
#include, #include_str, #include_bin
279+
#include, #include_str, #include_bin
280280

281281
* Tool improvements
282282
* Cargo automatically resolves dependencies

‎branches/snap-stage3/doc/README

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The markdown docs are only generated by make when node is installed (use
2-
`make doc`). If you don't have node installed you can generate them yourself.
3-
Unfortunately there's no real standard for markdown and all the tools work
2+
`make doc`). If you don't have node installed you can generate them yourself.
3+
Unfortunately there's no real standard for markdown and all the tools work
44
differently. pandoc is one that seems to work well.
55

66
To generate an html version of a doc do something like:
@@ -10,4 +10,4 @@ The syntax for pandoc flavored markdown can be found at:
1010
http://johnmacfarlane.net/pandoc/README.html#pandocs-markdown
1111

1212
A nice quick reference (for non-pandoc markdown) is at:
13-
http://kramdown.rubyforge.org/quickref.html
13+
http://kramdown.rubyforge.org/quickref.html

‎branches/snap-stage3/doc/rust.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3351,4 +3351,3 @@ Additional specific influences can be seen from the following languages:
33513351
* The typeclass system of Haskell.
33523352
* The lexical identifier rule of Python.
33533353
* The block syntax of Ruby.
3354-

‎branches/snap-stage3/doc/tutorial-macros.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,4 +402,3 @@ tricky. Invoking the `log_syntax!` macro can help elucidate intermediate
402402
states, invoking `trace_macros!(true)` will automatically print those
403403
intermediate states out, and passing the flag `--pretty expanded` as a
404404
command-line argument to the compiler will show the result of expansion.
405-

‎branches/snap-stage3/doc/tutorial-tasks.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,4 +511,3 @@ The parent task first calls `DuplexStream` to create a pair of bidirectional
511511
endpoints. It then uses `task::spawn` to create the child task, which captures
512512
one end of the communication channel. As a result, both parent and child can
513513
send and receive data to and from the other.
514-

‎branches/snap-stage3/doc/tutorial.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,9 +1006,9 @@ let mut d = @mut 5; // mutable variable, mutable box
10061006
d = @mut 15;
10071007
~~~~
10081008

1009-
A mutable variable and an immutable variable can refer to the same box, given
1010-
that their types are compatible. Mutability of a box is a property of its type,
1011-
however, so for example a mutable handle to an immutable box cannot be
1009+
A mutable variable and an immutable variable can refer to the same box, given
1010+
that their types are compatible. Mutability of a box is a property of its type,
1011+
however, so for example a mutable handle to an immutable box cannot be
10121012
assigned a reference to a mutable box.
10131013

10141014
~~~~
@@ -1041,7 +1041,7 @@ let y = x.clone(); // y is a newly allocated box
10411041
let z = x; // no new memory allocated, x can no longer be used
10421042
~~~~
10431043

1044-
Since in owned boxes mutability is a property of the owner, not the
1044+
Since in owned boxes mutability is a property of the owner, not the
10451045
box, mutable boxes may become immutable when they are moved, and vice-versa.
10461046

10471047
~~~~

‎branches/snap-stage3/doc/version_info.html.template

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@
77
</center>
88

99
</div>
10-

‎branches/snap-stage3/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/snap-stage3/mk/host.mk

Lines changed: 10 additions & 28 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-
| $$(HLIB$(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-
| $$(HLIB$(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-
| $$(HLIB$(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-
| $$(HLIB$(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-
| $$(HLIB$(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,40 +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-
| $$(HLIB$(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-
| $$(HLIB$(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-
| $$(HLIB$(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-
| $$(HLIB$(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-
133-
$$(HLIB$(2)_H_$(4))/:
134-
mkdir -p $$@
135-
136118
endef
137119

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

‎branches/snap-stage3/mk/platform.mk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
# Create variables HOST_<triple> containing the host part
1313
# of each target triple. For example, the triple i686-darwin-macos
14-
# would create a variable HOST_i686-darwin-macos with the value
14+
# would create a variable HOST_i686-darwin-macos with the value
1515
# i386.
1616
define DEF_HOST_VAR
1717
HOST_$(1) = $(subst i686,i386,$(word 1,$(subst -, ,$(1))))
@@ -276,8 +276,8 @@ CFG_GCCISH_CFLAGS_i686-pc-mingw32 := -Wall -Werror -g -march=i686
276276
CFG_GCCISH_CXXFLAGS_i686-pc-mingw32 := -fno-rtti
277277
CFG_GCCISH_LINK_FLAGS_i686-pc-mingw32 := -shared -fPIC -g
278278
CFG_GCCISH_DEF_FLAG_i686-pc-mingw32 :=
279-
CFG_GCCISH_PRE_LIB_FLAGS_i686-pc-mingw32 :=
280-
CFG_GCCISH_POST_LIB_FLAGS_i686-pc-mingw32 :=
279+
CFG_GCCISH_PRE_LIB_FLAGS_i686-pc-mingw32 :=
280+
CFG_GCCISH_POST_LIB_FLAGS_i686-pc-mingw32 :=
281281
CFG_DEF_SUFFIX_i686-pc-mingw32 := .mingw32.def
282282
CFG_INSTALL_NAME_i686-pc-mingw32 =
283283
CFG_LIBUV_LINK_FLAGS_i686-pc-mingw32 := -lWs2_32 -lpsapi -liphlpapi

0 commit comments

Comments
 (0)