Skip to content

Commit 8e079d4

Browse files
committed
---
yaml --- r: 80975 b: refs/heads/snap-stage3 c: e2e1061 h: refs/heads/master i: 80973: beb5e7f 80971: 39ec551 80967: abb2384 80959: 69335a3 v: v3
1 parent 760a289 commit 8e079d4

Some content is hidden

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

63 files changed

+399
-726
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: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: ff0aaaf138071ba2656c4c7bddc5267bb3f10e2e
4+
refs/heads/snap-stage3: e2e10618145c2804a7f486338011df2d1f58a609
55
refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ documentation.
6161

6262
[repo]: https://github.com/mozilla/rust
6363
[tarball]: http://static.rust-lang.org/dist/rust-0.7.tar.gz
64-
[tutorial]: http://static.rust-lang.org/doc/0.7/tutorial.html
64+
[tutorial]: http://static.rust-lang.org/doc/tutorial.html
6565

6666
## Notes
6767

branches/snap-stage3/RELEASES.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Version 0.8 (October 2013)
66
* Language
77
* The `for` loop syntax has changed to work with the `Iterator` trait.
88
* At long last, unwinding works on Windows.
9-
* Default methods definitely mostly work.
9+
* Default methods are ready for use.
1010
* Many trait inheritance bugs fixed.
1111
* Owned and borrowed trait objects work more reliably.
1212
* `copy` is no longer a keyword. It has been replaced by the `Clone` trait.
@@ -56,7 +56,7 @@ Version 0.8 (October 2013)
5656
be specified with `#[link_section = "..."]`.
5757
* The `proto!` syntax extension for defining bounded message protocols
5858
was removed.
59-
* `macro_rules!` is hygenic for `let` declarations.
59+
* `macro_rules!` is hygienic for `let` declarations.
6060
* The `#[export_name]` attribute specifies the name of a symbol.
6161
* `unreachable!` can be used to indicate unreachable code, and fails
6262
if executed.
@@ -92,7 +92,7 @@ Version 0.8 (October 2013)
9292
* std: Added `SharedPort` to `comm`.
9393
* std: `Eq` has a default method for `ne`; only `eq` is required
9494
in implementations.
95-
* std: `Ord` has default methods for `le`, `gt` and `le`; only `lt`
95+
* std: `Ord` has default methods for `le`, `gt` and `ge`; only `lt`
9696
is required in implementations.
9797
* std: `is_utf8` performance is improved, impacting many string functions.
9898
* std: `os::MemoryMap` provides cross-platform mmap.

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

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44

55
The container traits are defined in the `std::container` module.
66

7-
## Unique vectors
7+
## Unique and managed vectors
88

9-
Vectors have `O(1)` indexing, push (to the end) and pop (from the end). Vectors
10-
are the most common container in Rust, and are flexible enough to fit many use
11-
cases.
9+
Vectors have `O(1)` indexing and removal from the end, along with `O(1)`
10+
amortized insertion. Vectors are the most common container in Rust, and are
11+
flexible enough to fit many use cases.
1212

1313
Vectors can also be sorted and used as efficient lookup tables with the
14-
`bsearch()` method, if all the elements are inserted at one time and
14+
`std::vec::bsearch` function, if all the elements are inserted at one time and
1515
deletions are unnecessary.
1616

1717
## Maps and sets
@@ -42,15 +42,10 @@ implementing the `IterBytes` trait.
4242

4343
## Double-ended queues
4444

45-
The `extra::ringbuf` module implements a double-ended queue with `O(1)`
46-
amortized inserts and removals from both ends of the container. It also has
47-
`O(1)` indexing like a vector. The contained elements are not required to be
48-
copyable, and the queue will be sendable if the contained type is sendable.
49-
Its interface `Deque` is defined in `extra::collections`.
50-
51-
The `extra::dlist` module implements a double-ended linked list, also
52-
implementing the `Deque` trait, with `O(1)` removals and inserts at either end,
53-
and `O(1)` concatenation.
45+
The `extra::deque` module implements a double-ended queue with `O(1)` amortized
46+
inserts and removals from both ends of the container. It also has `O(1)`
47+
indexing like a vector. The contained elements are not required to be copyable,
48+
and the queue will be sendable if the contained type is sendable.
5449

5550
## Priority queues
5651

@@ -202,11 +197,11 @@ The function `range` (or `range_inclusive`) allows to simply iterate through a g
202197
203198
~~~
204199
for i in range(0, 5) {
205-
print!("{} ", i) // prints "0 1 2 3 4"
200+
printf!("%d ", i) // prints "0 1 2 3 4"
206201
}
207202

208203
for i in std::iter::range_inclusive(0, 5) { // needs explicit import
209-
print!("{} ", i) // prints "0 1 2 3 4 5"
204+
printf!("%d ", i) // prints "0 1 2 3 4 5"
210205
}
211206
~~~
212207
@@ -238,15 +233,15 @@ let mut it = xs.iter().zip(ys.iter());
238233

239234
// print out the pairs of elements up to (&3, &"baz")
240235
for (x, y) in it {
241-
println!("{} {}", *x, *y);
236+
printfln!("%d %s", *x, *y);
242237

243238
if *x == 3 {
244239
break;
245240
}
246241
}
247242

248243
// yield and print the last pair from the iterator
249-
println!("last: {:?}", it.next());
244+
printfln!("last: %?", it.next());
250245

251246
// the iterator is now fully consumed
252247
assert!(it.next().is_none());
@@ -340,13 +335,13 @@ another `DoubleEndedIterator` with `next` and `next_back` exchanged.
340335
~~~
341336
let xs = [1, 2, 3, 4, 5, 6];
342337
let mut it = xs.iter();
343-
println!("{:?}", it.next()); // prints `Some(&1)`
344-
println!("{:?}", it.next()); // prints `Some(&2)`
345-
println!("{:?}", it.next_back()); // prints `Some(&6)`
338+
printfln!("%?", it.next()); // prints `Some(&1)`
339+
printfln!("%?", it.next()); // prints `Some(&2)`
340+
printfln!("%?", it.next_back()); // prints `Some(&6)`
346341
347342
// prints `5`, `4` and `3`
348343
for &x in it.invert() {
349-
println!("{}", x)
344+
printfln!("%?", x)
350345
}
351346
~~~
352347

@@ -361,11 +356,11 @@ let xs = [1, 2, 3, 4];
361356
let ys = [5, 6, 7, 8];
362357
let mut it = xs.iter().chain(ys.iter()).map(|&x| x * 2);
363358
364-
println!("{:?}", it.next()); // prints `Some(2)`
359+
printfln!("%?", it.next()); // prints `Some(2)`
365360
366361
// prints `16`, `14`, `12`, `10`, `8`, `6`, `4`
367362
for x in it.invert() {
368-
println!("{}", x);
363+
printfln!("%?", x);
369364
}
370365
~~~
371366

@@ -392,17 +387,17 @@ underlying iterators are.
392387
let xs = [1, 2, 3, 4, 5];
393388
let ys = ~[7, 9, 11];
394389
let mut it = xs.iter().chain(ys.iter());
395-
println!("{:?}", it.idx(0)); // prints `Some(&1)`
396-
println!("{:?}", it.idx(5)); // prints `Some(&7)`
397-
println!("{:?}", it.idx(7)); // prints `Some(&11)`
398-
println!("{:?}", it.idx(8)); // prints `None`
390+
printfln!("%?", it.idx(0)); // prints `Some(&1)`
391+
printfln!("%?", it.idx(5)); // prints `Some(&7)`
392+
printfln!("%?", it.idx(7)); // prints `Some(&11)`
393+
printfln!("%?", it.idx(8)); // prints `None`
399394
400395
// yield two elements from the beginning, and one from the end
401396
it.next();
402397
it.next();
403398
it.next_back();
404399
405-
println!("{:?}", it.idx(0)); // prints `Some(&3)`
406-
println!("{:?}", it.idx(4)); // prints `Some(&9)`
407-
println!("{:?}", it.idx(6)); // prints `None`
400+
printfln!("%?", it.idx(0)); // prints `Some(&3)`
401+
printfln!("%?", it.idx(4)); // prints `Some(&9)`
402+
printfln!("%?", it.idx(6)); // prints `None`
408403
~~~

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ fn fib(n: uint) -> uint {
280280
12586269025
281281
}
282282
283-
let mut delayed_fib = extra::future::Future::spawn (|| fib(50) );
283+
let mut delayed_fib = extra::future::spawn (|| fib(50) );
284284
make_a_sandwich();
285285
println(fmt!("fib(50) = %?", delayed_fib.get()))
286286
~~~
@@ -304,7 +304,7 @@ fn partial_sum(start: uint) -> f64 {
304304
}
305305
306306
fn main() {
307-
let mut futures = vec::from_fn(1000, |ind| do extra::future::Future::spawn { partial_sum(ind) });
307+
let mut futures = vec::from_fn(1000, |ind| do extra::future::spawn { partial_sum(ind) });
308308
309309
let mut final_res = 0f64;
310310
for ft in futures.mut_iter() {

branches/snap-stage3/doc/tutorial.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,9 @@ recommended.
6363

6464
Since the Rust compiler is written in Rust, it must be built by
6565
a precompiled "snapshot" version of itself (made in an earlier state
66-
of development). The source build automatically fetches these snapshots
67-
from the Internet on our supported platforms.
66+
of development). As such, source builds require a connection to
67+
the Internet, to fetch snapshots, and an OS that can execute the
68+
available snapshot binaries.
6869

6970
Snapshot binaries are currently built and tested on several platforms:
7071

@@ -2978,15 +2979,15 @@ tutorials on individual topics.
29782979
* [The foreign function interface][ffi]
29792980
* [Containers and iterators](tutorial-container.html)
29802981
* [Error-handling and Conditions](tutorial-conditions.html)
2981-
* [Packaging up Rust code][rustpkg]
2982+
* [Packaging up Rust code](rustpkg)
29822983

29832984
There is further documentation on the [wiki], however those tend to be even more out of date as this document.
29842985

29852986
[borrow]: tutorial-borrowed-ptr.html
29862987
[tasks]: tutorial-tasks.html
29872988
[macros]: tutorial-macros.html
29882989
[ffi]: tutorial-ffi.html
2989-
[rustpkg]: rustpkg.html
2990+
[rustpkg]: tutorial-rustpkg.html
29902991

29912992
[wiki]: https://github.com/mozilla/rust/wiki/Docs
29922993

branches/snap-stage3/man/rustpkg.1

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ Remove all generated files from the \fIbuild\fR directory in the target's worksp
2727
Builds the specified target, and all its dependencies, and then installs the
2828
build products into the \fIlib\fR and \fIbin\fR directories of their respective
2929
workspaces.
30-
.TP
31-
\fBinit\fR
32-
Initializes the current working directory into a workspace.
3330

3431
.SS "BUILD COMMAND"
3532

@@ -62,17 +59,6 @@ Examples:
6259
$ rustpkg install github.com/mozilla/servo.git#1.2
6360
$ rustpkg install rust-glfw
6461

65-
.SS "INIT COMMAND"
66-
67-
rustpkg init
68-
69-
This will turn the current working directory into a workspace. The first
70-
command you run when starting off a new project.
71-
72-
Example:
73-
74-
$ rustpkg init
75-
7662
.SH "ENVIRONMENT"
7763

7864
.TP

branches/snap-stage3/src/libextra/fileinput.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -420,6 +420,7 @@ mod test {
420420
use std::rt::io;
421421
use std::rt::io::Writer;
422422
use std::rt::io::file;
423+
use std::uint;
423424
use std::vec;
424425

425426
fn make_file(path : &Path, contents: &[~str]) {

0 commit comments

Comments
 (0)