Skip to content

Commit 4b1564e

Browse files
committed
---
yaml --- r: 68573 b: refs/heads/auto c: 5cfad4b h: refs/heads/master i: 68571: 0d8f6b6 v: v3
1 parent af384ca commit 4b1564e

File tree

760 files changed

+19678
-22305
lines changed

Some content is hidden

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

760 files changed

+19678
-22305
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1414
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1515
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1616
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
17-
refs/heads/auto: 54e01eb7e0ea74c01a797f56e2bf602c298a9769
17+
refs/heads/auto: 5cfad4b6de3a9ab749c975338c23fc2e20b0beec
1818
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1919
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/.gitmodules

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
[submodule "src/llvm"]
22
path = src/llvm
33
url = https://github.com/brson/llvm.git
4-
branch = master
54
[submodule "src/libuv"]
65
path = src/libuv
76
url = https://github.com/brson/libuv.git
8-
branch = master

branches/auto/AUTHORS.txt

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,9 @@ Aleksander Balicki <[email protected]>
1010
Alex Crichton <[email protected]>
1111
Alex Rønne Petersen <[email protected]>
1212
Alexander Stavonin <[email protected]>
13-
Alexei Sholik <[email protected]>
1413
Andreas Gal <[email protected]>
1514
Andrew Dunham <[email protected]>
1615
Andrew Paseltiner <[email protected]>
17-
Anthony Juckel <[email protected]>
1816
Arkaitz Jimenez <[email protected]>
1917
Armin Ronacher <[email protected]>
2018
Ashok Gautham <[email protected]>
@@ -31,32 +29,23 @@ Benjamin Kircher <[email protected]>
3129
Benjamin Peterson <[email protected]>
3230
Bilal Husain <[email protected]>
3331
Bill Fallon <[email protected]>
34-
Bill Myers <[email protected]>
35-
Bill Wendling <[email protected]>
36-
Björn Steinbrink <[email protected]>
3732
Brendan Eich <[email protected]>
3833
Brendan Zabarauskas <[email protected]>
3934
Brett Cannon <[email protected]>
4035
Brian Anderson <[email protected]>
4136
Brian J. Burg <[email protected]>
4237
Brian Leibig <[email protected]>
43-
Bryan Dunsmore <[email protected]>
44-
Caitlin Potter <[email protected]>
4538
Chris Double <[email protected]>
4639
Chris Peterson <[email protected]>
4740
Chris Pressey <[email protected]>
4841
Cody Schroeder <[email protected]>
49-
Corey Richardson <[email protected]>
5042
Damian Gryski <[email protected]>
5143
Damien Grassart <[email protected]>
5244
Damien Schoof <[email protected]>
5345
Daniel Brooks <[email protected]>
54-
Daniel Farina <[email protected]>
55-
5646
Daniel Luz <[email protected]>
5747
Daniel Micay <[email protected]>
5848
Daniel Patterson <[email protected]>
59-
Daniel Ralston <[email protected]>
6049
Daniel Ursache Dogariu <[email protected]>
6150
Dave Herman <[email protected]>
6251
David Forsythe <[email protected]>
@@ -73,21 +62,17 @@ Eric Holmes <[email protected]>
7362
Erick Tryzelaar <[email protected]>
7463
Erik Rose <[email protected]>
7564
Evan McClanahan <[email protected]>
76-
Fedor Indutny <[email protected]>
7765
Felix S. Klock II <[email protected]>
7866
Francisco Souza <[email protected]>
7967
Franklin Chen <[email protected]>
80-
Gábor Horváth <[email protected]>
8168
8269
Gareth Daniel Smith <[email protected]>
83-
8470
Glenn Willen <[email protected]>
8571
Gonçalo Cabrita <[email protected]>
8672
Graham Fawcett <[email protected]>
8773
Grahame Bowland <[email protected]>
8874
Haitao Li <[email protected]>
8975
90-
Herman J. Radtke III <[email protected]>
9176
Huon Wilson <[email protected]>
9277
Ian D. Bollinger <[email protected]>
9378
Ilyong Cho <[email protected]>
@@ -98,7 +83,6 @@ Jacob Harris Cryer Kragh <[email protected]>
9883
Jacob Parker <[email protected]>
9984
Jakub Wieczorek <[email protected]>
10085
James Miller <[email protected]>
101-
James Tranovich <[email protected]>
10286
Jason Orendorff <[email protected]>
10387
Jed Davis <[email protected]>
10488
Jeff Balogh <[email protected]>
@@ -108,7 +92,6 @@ Jeffrey Yasskin <[email protected]>
10892
Jeong YunWon <[email protected]>
10993
Jens Nockert <[email protected]>
11094
Jesse Jones <[email protected]>
111-
Jesse Luehrs <[email protected]>
11295
Jesse Ruderman <[email protected]>
11396
Jihyun Yu <[email protected]>
11497
Jim Blandy <[email protected]>
@@ -121,18 +104,14 @@ Jonathan Sternberg <[email protected]>
121104
Josh Matthews <[email protected]>
122105
Joshua Clark <[email protected]>
123106
Joshua Wise <[email protected]>
124-
Junyoung Cho <[email protected]>
125107
Jyun-Yan You <[email protected]>
126108
Kang Seonghoon <[email protected]>
127109
Kelly Wilson <[email protected]>
128110
Kevin Atkinson <[email protected]>
129-
Kevin Ballard <[email protected]>
130111
Kevin Cantu <[email protected]>
131-
132112
Kyeongwoon Lee <[email protected]>
133113
Laurent Bonnans <[email protected]>
134114
Lawrence Velázquez <[email protected]>
135-
Leah Hanson <[email protected]>
136115
Lennart Kudling <[email protected]>
137116
Lindsey Kuper <[email protected]>
138117
Luca Bruno <[email protected]>
@@ -143,7 +122,6 @@ Margaret Meyerhofer <[email protected]>
143122
Marijn Haverbeke <[email protected]>
144123
Mark Lacey <[email protected]>
145124
Mark Vian <[email protected]>
146-
Marti Raudsepp <[email protected]>
147125
Martin DeMello <[email protected]>
148126
Marvin Löbel <[email protected]>
149127
Matt Brubeck <[email protected]>
@@ -165,64 +143,43 @@ Patrick Walton <[email protected]>
165143
Patrik Kårlin <[email protected]>
166144
Paul Stansifer <[email protected]>
167145
Paul Woolcock <[email protected]>
168-
Pavel Panchekha <[email protected]>
169146
Peter Hull <[email protected]>
170147
Peter Williams <[email protected]>
171148
Philipp Brüschweiler <[email protected]>
172149
Rafael Ávila de Espíndola <[email protected]>
173-
Ralph Bodenner <[email protected]>
174150
Ralph Giles <[email protected]>
175-
Ramkumar Ramachandra <[email protected]>
176151
Reuben Morais <[email protected]>
177152
Rick Waldron <[email protected]>
178153
Rob Arnold <[email protected]>
179-
Rob Hoelz <[email protected]>
180154
Roland Tanglao <[email protected]>
181-
Ron Dahlgren <[email protected]>
182155
Roy Frostig <[email protected]>
183156
Ryan Scheel <[email protected]>
184-
Samuel Chase <[email protected]>
185-
Sander Mathijs van Veen <[email protected]>
186-
Sangeun Kim <[email protected]>
187-
Saurabh Anand <[email protected]>
188-
Sean Moon <[email protected]>
189157
Sean Stangl <[email protected]>
190158
Sebastian N. Fernandez <[email protected]>
191159
Seth Pink <[email protected]>
192160
Seo Sanghyeon <[email protected]>
193161
194-
SiegeLord <[email protected]>
195162
Simon Barber-Dueck <[email protected]>
196163
Simon Sapin <[email protected]>
197164
startling <[email protected]>
198165
Stefan Plantikow <[email protected]>
199166
Steve Klabnik <[email protected]>
200-
Steven De Coeyer <[email protected]>
201-
Steven Fackler <[email protected]>
202-
Steven Stewart-Gallus <[email protected]>
203167
Taras Shpot <[email protected]>
204168
Ted Horst <[email protected]>
205169
Thad Guidry <[email protected]>
206-
Thomas Daede <[email protected]>
207170
Tim Chevalier <[email protected]>
208171
Tim Taubert <[email protected]>
209172
210-
Tommy M. McGuire <[email protected]>
211173
Tomoki Aonuma <[email protected]>
212174
Tony Young <[email protected]>
213175
214176
Tycho Sci <[email protected]>
215177
Tyler Bindon <[email protected]>
216-
Uwe Dauernheim <[email protected]>
217-
Vadim Chugunov <[email protected]>
218178
Viktor Dahl <[email protected]>
219179
Vincent Belliard <[email protected]>
220-
Vivek Galatage <[email protected]>
221180
Wade Mealing <[email protected]>
222181
William Ting <[email protected]>
223182
Yasuhiro Fujii <[email protected]>
224183
Young-il Choi <[email protected]>
225-
Youngmin Yoo <[email protected]>
226184
Youngsoo Son <[email protected]>
227185
Zack Corr <[email protected]>
228-

branches/auto/Makefile.in

Lines changed: 10 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,8 @@ endif
139139

140140
# version-string calculation
141141
CFG_GIT_DIR := $(CFG_SRC_DIR).git
142-
CFG_RELEASE = 0.7
142+
CFG_RELEASE = 0.6
143143
CFG_VERSION = $(CFG_RELEASE)
144-
# windows exe's need numeric versions - don't use anything but
145-
# numbers and dots here
146-
CFG_VERSION_WIN = 0.7
147144

148145
ifneq ($(wildcard $(CFG_GIT)),)
149146
ifneq ($(wildcard $(CFG_GIT_DIR)),)
@@ -242,29 +239,29 @@ $(foreach target,$(CFG_TARGET_TRIPLES),\
242239
# Standard library variables
243240
######################################################################
244241

245-
STDLIB_CRATE := $(S)src/libstd/std.rs
242+
STDLIB_CRATE := $(S)src/libstd/core.rc
246243
STDLIB_INPUTS := $(wildcard $(addprefix $(S)src/libstd/, \
247-
*.rs */*.rs */*/*rs */*/*/*rs))
244+
core.rc *.rs */*.rs */*/*rs */*/*/*rs))
248245

249246
######################################################################
250247
# Extra library variables
251248
######################################################################
252249

253-
EXTRALIB_CRATE := $(S)src/libextra/extra.rs
250+
EXTRALIB_CRATE := $(S)src/libextra/std.rc
254251
EXTRALIB_INPUTS := $(wildcard $(addprefix $(S)src/libextra/, \
255-
*.rs */*.rs))
252+
std.rc *.rs */*.rs))
256253

257254
######################################################################
258255
# rustc crate variables
259256
######################################################################
260257

261-
COMPILER_CRATE := $(S)src/librustc/rustc.rs
258+
COMPILER_CRATE := $(S)src/librustc/rustc.rc
262259
COMPILER_INPUTS := $(wildcard $(addprefix $(S)src/librustc/, \
263-
*.rs */*.rs */*/*.rs */*/*/*.rs))
260+
rustc.rc *.rs */*.rs */*/*.rs */*/*/*.rs))
264261

265-
LIBSYNTAX_CRATE := $(S)src/libsyntax/syntax.rs
262+
LIBSYNTAX_CRATE := $(S)src/libsyntax/syntax.rc
266263
LIBSYNTAX_INPUTS := $(wildcard $(addprefix $(S)src/libsyntax/, \
267-
*.rs */*.rs */*/*.rs))
264+
syntax.rc *.rs */*.rs */*/*.rs))
268265

269266
DRIVER_CRATE := $(S)src/driver/driver.rs
270267

@@ -314,7 +311,6 @@ $(foreach host,$(CFG_HOST_TRIPLES), \
314311
export CFG_SRC_DIR
315312
export CFG_BUILD_DIR
316313
export CFG_VERSION
317-
export CFG_VERSION_WIN
318314
export CFG_BUILD_TRIPLE
319315
export CFG_LLVM_ROOT
320316
export CFG_ENABLE_MINGW_CROSS
@@ -540,19 +536,10 @@ ALL_TARGET_RULES = $(foreach target,$(CFG_TARGET_TRIPLES), \
540536
$(foreach host,$(CFG_HOST_TRIPLES), \
541537
all-target-$(target)-host-$(host)))
542538

543-
all: rustllvm/llvm-auto-clean-stamp \
544-
$(ALL_TARGET_RULES) $(GENERATED) docs
539+
all: $(ALL_TARGET_RULES) $(GENERATED) docs
545540

546541
endif
547542

548-
# This is used to independently force an LLVM clean rebuild
549-
# when we changed something not otherwise captured by builtin
550-
# dependencies. In these cases, commit a change that touches
551-
# the stamp in the source dir.
552-
rustllvm/llvm-auto-clean-stamp: $(S)src/rustllvm/llvm-auto-clean-trigger
553-
$(Q)$(MAKE) clean-llvm
554-
touch $@
555-
556543

557544
######################################################################
558545
# Re-configuration

branches/auto/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,9 @@ packages:
4242
Assuming you're on a relatively modern *nix system and have met the
4343
prerequisites, something along these lines should work.
4444

45-
$ curl -O http://static.rust-lang.org/dist/rust-0.7.tar.gz
46-
$ tar -xzf rust-0.7.tar.gz
47-
$ cd rust-0.7
45+
$ curl -O http://static.rust-lang.org/dist/rust-0.6.tar.gz
46+
$ tar -xzf rust-0.6.tar.gz
47+
$ cd rust-0.6
4848
$ ./configure
4949
$ make && make install
5050

@@ -59,8 +59,8 @@ When complete, `make install` will place several programs into
5959
API-documentation tool, and `rustpkg`, the Rust package manager and build system.
6060

6161
[wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
62-
[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz
63-
[win-exe]: http://static.rust-lang.org/dist/rust-0.7-install.exe
62+
[tarball]: http://static.rust-lang.org/dist/rust-0.6.tar.gz
63+
[win-exe]: http://static.rust-lang.org/dist/rust-0.6-install.exe
6464

6565

6666
## License

0 commit comments

Comments
 (0)