Skip to content

Commit cfe9167

Browse files
author
Eric Reed
committed
---
yaml --- r: 63707 b: refs/heads/snap-stage3 c: 42f3f06 h: refs/heads/master i: 63705: d3c5f50 63703: 081e3dd v: v3
1 parent c26324e commit cfe9167

File tree

557 files changed

+13109
-12105
lines changed

Some content is hidden

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

557 files changed

+13109
-12105
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: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 23fb2278c7c50cf5785b1c109bc399bf87fdd542
4+
refs/heads/snap-stage3: 42f3f069fa1963cdf19117e57a83089889a64f37
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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/snap-stage3/Makefile.in

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -239,29 +239,29 @@ $(foreach target,$(CFG_TARGET_TRIPLES),\
239239
# Standard library variables
240240
######################################################################
241241

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

246246
######################################################################
247247
# Extra library variables
248248
######################################################################
249249

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

254254
######################################################################
255255
# rustc crate variables
256256
######################################################################
257257

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

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

266266
DRIVER_CRATE := $(S)src/driver/driver.rs
267267

branches/snap-stage3/RELEASES.txt

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@ Version 0.7 (July 2013)
77
* `use mod` is no longer valid.
88
* `fail!` and `assert!` accept `~str`, `&'static str` or `fmt!`-style
99
argument list.
10-
* `Encodable`, `Decodable`, `Ord`, `TotalOrd`, `TotalEq`, `DeepClone`,
11-
`Rand`, `Zero` and `ToStr` can all be automatically derived with
12-
`#[deriving(...)]`.
10+
* `Encodable`, `Decodable`, `TotalOrd`, `TotalEq`, `DeepClone` can all
11+
be automatically derived with `#[deriving(...)]`.
1312
* The `Durable` trait is replaced with the `'static` bounds.
1413
* At long last, 'argument modes' no longer exist.
1514
* The `bytes!` macro returns a vector of bytes for string, u8, char,
1615
and unsuffixed integer literals.
17-
* `#[static_assert]` makes compile-time assertions about static bools.
1816

1917
* Semantic changes
2018
* The borrow checker has been rewritten with flow-sensitivity, fixing
@@ -36,7 +34,7 @@ Version 0.7 (July 2013)
3634
* The `#[mutable]` attribute makes a type that would otherwise be
3735
`Const`, note. TODO this may change to non_freeze before 0.7
3836
* Unbounded recursion will abort the process after reaching the limit
39-
specified by the `RUST_MAX_STACK` environment variable (default: 1GB).
37+
specified by the `RUST_MAX_STACK` environment variable.
4038
* The `vecs_implicitly_copyable` lint mode has been removed. Vectors
4139
are never implicitly copyable.
4240

@@ -48,37 +46,30 @@ Version 0.7 (July 2013)
4846
* std: Prelude additions: `print`, `println`, `FromStr`, `ApproxEq`, `Equiv`,
4947
`Iterator`, `IteratorUtil`, many numeric traits, many tuple traits.
5048
* std: `iterator` module for external iterator objects.
51-
* std: Many old internal vector and string iterators,
52-
incl. `any`, `all`. removed.
5349
* std: new numeric traits: `Fractional`, `Real`, `RealExt`, `Integer`, `Ratio`,
5450
`Algebraic`, `Trigonometric`, `Exponential`, `Primitive`.
5551
* std: Tuple traits and accessors defined for up to 12-tuples, e.g.
5652
`(0, 1, 2).n2()` or `(0, 1, 2).n2_ref()`.
57-
* std: many types implement `Clone`.
53+
* std: many types implement `Clone` - tuples, @, @mut. TODO
5854
* std: `path` type renamed to `Path`.
59-
* std: Many standalone functions removed in favor of methods and iterators
60-
in `vec`, `str`. In the future methods will also work as functions.
55+
* std: Many standalone functions removed in favor of methods in
56+
`vec`, `str`. In the future methods will also work as functions.
6157
* std: `reinterpret_cast` removed. Used `transmute`.
6258
* std: ascii string handling in `std::ascii`.
6359
* std: `Rand` is implemented for ~/@.
6460
* std: `run` module for spawning processes overhauled.
6561
* std: Various atomic types added to `unstable::atomic`.
6662
* std: `LinearMap` and `LinearSet` renamed to `HashMap` and `HashSet`.
67-
* std: Borrowed pointer functions moved from `ptr` to `borrow`.
6863
* std: Added `os::mkdir_recursive`.
6964
* std: Added `os::glob` function performs filesystems globs.
7065
* std: `FuzzyEq` renamed to `ApproxEq`.
7166
* std: `Map` now defines `pop` and `swap` methods.
72-
* std: `Cell` constructors converted to static methods.
73-
* extra: `rc` module adds the reference counted pointers, `Rc` and `RcMut`.
7467
* extra: `flate` module moved from `std` to `extra`.
75-
* extra: `fileinput` module for iterating over a series of files.
68+
* extra: `FileInput` implements `std::io::Reader`.
7669
* extra: `Complex` number type and `complex` module.
7770
* extra: `Rational` number type and `rational` module.
7871
* extra: `BigInt`, `BigUint` implement numeric and comparison traits.
7972
* extra: `term` uses terminfo now, is more correct.
80-
* extra: `arc` functions converted to methods.
81-
* extra: Implementation of fixed output size variations of SHA-2.
8273

8374
* Tooling
8475
* `unused_unsafe` lint mode for detecting unnecessary `unsafe` blocks.

branches/snap-stage3/configure

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -834,7 +834,9 @@ do
834834
LLVM_TARGET="--target=$t"
835835

836836
# Disable unused LLVM features
837-
LLVM_OPTS="$LLVM_DBG_OPTS --disable-docs --enable-bindings=none"
837+
LLVM_OPTS="$LLVM_DBG_OPTS --disable-docs \
838+
--enable-bindings=none --disable-threads \
839+
--disable-pthreads"
838840

839841
case "$CFG_C_COMPILER" in
840842
("ccache clang")

branches/snap-stage3/doc/README

Lines changed: 6 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,10 @@
1-
Pandoc, a universal document converter, is required to generate docs as HTML
2-
from Rust's source code. It's available for most platforms here:
3-
http://johnmacfarlane.net/pandoc/installing.html
1+
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
4+
differently. pandoc is one that seems to work well.
45

5-
Node.js (http://nodejs.org/) is also required for generating HTML from
6-
the Markdown docs (reference manual, tutorials, etc.) distributed with
7-
this git repository.
8-
9-
To generate all the docs, run `make docs` from the root of the repository.
10-
This will convert the distributed Markdown docs to HTML and generate HTML doc
11-
for the 'std' and 'extra' libraries.
12-
13-
To generate HTML documentation from one source file/crate, do something like:
14-
15-
rustdoc --output-dir html-doc/ --output-format html ../src/libstd/path.rs
16-
17-
(This, of course, requires that you've built/installed the `rustdoc` tool.)
18-
19-
To generate an HTML version of a doc from Markdown, without having Node.js
20-
installed, do something like:
21-
22-
pandoc --from=markdown --to=html --number-sections -o rust.html rust.md
6+
To generate an html version of a doc do something like:
7+
pandoc --from=markdown --to=html --number-sections -o build/doc/rust.html doc/rust.md && git web--browse build/doc/rust.html
238

249
The syntax for pandoc flavored markdown can be found at:
2510
http://johnmacfarlane.net/pandoc/README.html#pandocs-markdown

branches/snap-stage3/doc/rust.md

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -882,11 +882,11 @@ the function name.
882882

883883
~~~~ {.xfail-test}
884884
fn iter<T>(seq: &[T], f: &fn(T)) {
885-
for seq.iter().advance |elt| { f(elt); }
885+
for seq.each |elt| { f(elt); }
886886
}
887887
fn map<T, U>(seq: &[T], f: &fn(T) -> U) -> ~[U] {
888888
let mut acc = ~[];
889-
for seq.iter().advance |elt| { acc.push(f(elt)); }
889+
for seq.each |elt| { acc.push(f(elt)); }
890890
acc
891891
}
892892
~~~~
@@ -1561,11 +1561,8 @@ Supported traits for `deriving` are:
15611561
* `Clone` and `DeepClone`, to perform (deep) copies.
15621562
* `IterBytes`, to iterate over the bytes in a data type.
15631563
* `Rand`, to create a random instance of a data type.
1564-
* `Zero`, to create an zero (or empty) instance of a data type.
15651564
* `ToStr`, to convert to a string. For a type with this instance,
1566-
`obj.to_str()` has similar output as `fmt!("%?", obj)`, but it differs in that
1567-
each constituent field of the type must also implement `ToStr` and will have
1568-
`field.to_str()` invoked to build up the result.
1565+
`obj.to_str()` has the same output as `fmt!("%?", obj)`.
15691566

15701567
# Statements and expressions
15711568

@@ -2329,7 +2326,7 @@ An example of a for loop over the contents of a vector:
23292326
23302327
let v: &[foo] = &[a, b, c];
23312328
2332-
for v.iter().advance |e| {
2329+
for v.each |e| {
23332330
bar(*e);
23342331
}
23352332
~~~~

branches/snap-stage3/doc/tutorial-borrowed-ptr.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ would therefore be subject to garbage collection. A heap box that is
234234
unrooted is one such that no pointer values in the heap point to
235235
it. It would violate memory safety for the box that was originally
236236
assigned to `x` to be garbage-collected, since a non-heap
237-
pointer *`y`* still points into it.
237+
pointer---`y`---still points into it.
238238

239239
> ***Note:*** Our current implementation implements the garbage collector
240240
> using reference counting and cycle detection.
@@ -475,7 +475,7 @@ but otherwise it requires that the data reside in immutable memory.
475475

476476
# Returning borrowed pointers
477477

478-
So far, all of the examples we have looked at, use borrowed pointers in a
478+
So far, all of the examples we've looked at use borrowed pointers in a
479479
“downward” direction. That is, a method or code block creates a
480480
borrowed pointer, then uses it within the same scope. It is also
481481
possible to return borrowed pointers as the result of a function, but
@@ -509,7 +509,7 @@ guaranteed to refer to a distinct lifetime from the lifetimes of all
509509
other parameters.
510510

511511
Named lifetimes that appear in function signatures are conceptually
512-
the same as the other lifetimes we have seen before, but they are a bit
512+
the same as the other lifetimes we've seen before, but they are a bit
513513
abstract: they don’t refer to a specific expression within `get_x()`,
514514
but rather to some expression within the *caller of `get_x()`*. The
515515
lifetime `r` is actually a kind of *lifetime parameter*: it is defined

0 commit comments

Comments
 (0)