Skip to content

Commit 2afb72a

Browse files
borsbors
committed
---
yaml --- r: 98227 b: refs/heads/master c: 1a9641b h: refs/heads/master i: 98225: e9ce7a6 98223: ca8df2d v: v3
1 parent 3333a2c commit 2afb72a

File tree

226 files changed

+7581
-5498
lines changed

Some content is hidden

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

226 files changed

+7581
-5498
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 8f93d39c75ef7964ea1dfb5cd8155dd29e61b76b
2+
refs/heads/master: 1a9641bf8e02230427a6e90e6662b879dec8caf2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: b6400f998497c3958f40997a71756ead344a776d
55
refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36

‎trunk/Makefile.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,9 @@ DRIVER_CRATE := $(S)src/driver/driver.rs
371371
LLVM_COMPONENTS=x86 arm mips ipo bitreader bitwriter linker asmparser jit mcjit \
372372
interpreter instrumentation
373373

374+
# Only build these LLVM tools
375+
LLVM_TOOLS=bugpoint llc llvm-ar llvm-as llvm-dis llvm-mc opt
376+
374377
define DEF_LLVM_VARS
375378
# The configure script defines these variables with the target triples
376379
# separated by Z. This defines new ones with the expected format.

‎trunk/doc/complement-cheatsheet.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ let reader : File = File::open(&path).unwrap_or_else(on_error);
6262
Use the [`lines`](http://static.rust-lang.org/doc/master/std/io/trait.Buffer.html#method.lines) method on a [`BufferedReader`](http://static.rust-lang.org/doc/master/std/io/buffered/struct.BufferedReader.html).
6363

6464
~~~
65-
use std::io::buffered::BufferedReader;
66-
# use std::io::mem::MemReader;
65+
use std::io::BufferedReader;
66+
# use std::io::MemReader;
6767
6868
# let reader = MemReader::new(~[]);
6969

‎trunk/doc/guide-conditions.md

Lines changed: 20 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,11 @@ An example program that does this task reads like this:
4646
~~~~
4747
# #[allow(unused_imports)];
4848
# extern mod extra;
49-
use std::io::buffered::BufferedReader;
50-
use std::io::File;
49+
use std::io::{BufferedReader, File};
5150
# mod BufferedReader {
5251
# use std::io::File;
53-
# use std::io::mem::MemReader;
54-
# use std::io::buffered::BufferedReader;
52+
# use std::io::MemReader;
53+
# use std::io::BufferedReader;
5554
# static s : &'static [u8] = bytes!("1 2\n\
5655
# 34 56\n\
5756
# 789 123\n\
@@ -245,13 +244,12 @@ and trapping its exit status using `task::try`:
245244
~~~~
246245
# #[allow(unused_imports)];
247246
# extern mod extra;
248-
use std::io::buffered::BufferedReader;
249-
use std::io::File;
247+
use std::io::{BufferedReader, File};
250248
use std::task;
251249
# mod BufferedReader {
252250
# use std::io::File;
253-
# use std::io::mem::MemReader;
254-
# use std::io::buffered::BufferedReader;
251+
# use std::io::MemReader;
252+
# use std::io::BufferedReader;
255253
# static s : &'static [u8] = bytes!("1 2\n\
256254
# 34 56\n\
257255
# 789 123\n\
@@ -350,12 +348,11 @@ but similarly clear as the version that used `fail!` in the logic where the erro
350348
~~~~
351349
# #[allow(unused_imports)];
352350
# extern mod extra;
353-
use std::io::buffered::BufferedReader;
354-
use std::io::File;
351+
use std::io::{BufferedReader, File};
355352
# mod BufferedReader {
356353
# use std::io::File;
357-
# use std::io::mem::MemReader;
358-
# use std::io::buffered::BufferedReader;
354+
# use std::io::MemReader;
355+
# use std::io::BufferedReader;
359356
# static s : &'static [u8] = bytes!("1 2\n\
360357
# 34 56\n\
361358
# 789 123\n\
@@ -420,12 +417,11 @@ and replaces bad input lines with the pair `(-1,-1)`:
420417
~~~~
421418
# #[allow(unused_imports)];
422419
# extern mod extra;
423-
use std::io::buffered::BufferedReader;
424-
use std::io::File;
420+
use std::io::{BufferedReader, File};
425421
# mod BufferedReader {
426422
# use std::io::File;
427-
# use std::io::mem::MemReader;
428-
# use std::io::buffered::BufferedReader;
423+
# use std::io::MemReader;
424+
# use std::io::BufferedReader;
429425
# static s : &'static [u8] = bytes!("1 2\n\
430426
# 34 56\n\
431427
# 789 123\n\
@@ -496,12 +492,11 @@ Changing the condition's return type from `(int,int)` to `Option<(int,int)>` wil
496492
~~~~
497493
# #[allow(unused_imports)];
498494
# extern mod extra;
499-
use std::io::buffered::BufferedReader;
500-
use std::io::File;
495+
use std::io::{BufferedReader, File};
501496
# mod BufferedReader {
502497
# use std::io::File;
503-
# use std::io::mem::MemReader;
504-
# use std::io::buffered::BufferedReader;
498+
# use std::io::MemReader;
499+
# use std::io::BufferedReader;
505500
# static s : &'static [u8] = bytes!("1 2\n\
506501
# 34 56\n\
507502
# 789 123\n\
@@ -582,12 +577,11 @@ This can be encoded in the handler API by introducing a helper type: `enum Malfo
582577
~~~~
583578
# #[allow(unused_imports)];
584579
# extern mod extra;
585-
use std::io::buffered::BufferedReader;
586580
use std::io::File;
587581
# mod BufferedReader {
588582
# use std::io::File;
589-
# use std::io::mem::MemReader;
590-
# use std::io::buffered::BufferedReader;
583+
# use std::io::MemReader;
584+
# use std::io::BufferedReader;
591585
# static s : &'static [u8] = bytes!("1 2\n\
592586
# 34 56\n\
593587
# 789 123\n\
@@ -707,12 +701,11 @@ a second condition and a helper function will suffice:
707701
~~~~
708702
# #[allow(unused_imports)];
709703
# extern mod extra;
710-
use std::io::buffered::BufferedReader;
711-
use std::io::File;
704+
use std::io::{BufferedReader, File};
712705
# mod BufferedReader {
713706
# use std::io::File;
714-
# use std::io::mem::MemReader;
715-
# use std::io::buffered::BufferedReader;
707+
# use std::io::MemReader;
708+
# use std::io::BufferedReader;
716709
# static s : &'static [u8] = bytes!("1 2\n\
717710
# 34 56\n\
718711
# 789 123\n\

‎trunk/doc/guide-tasks.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,7 @@ be distributed on the available cores.
290290
fn partial_sum(start: uint) -> f64 {
291291
let mut local_sum = 0f64;
292292
for num in range(start*100000, (start+1)*100000) {
293-
local_sum += (num as f64 + 1.0).pow(&-2.0);
293+
local_sum += (num as f64 + 1.0).powf(&-2.0);
294294
}
295295
local_sum
296296
}
@@ -326,7 +326,7 @@ a single large vector of floats. Each task needs the full vector to perform its
326326
use extra::arc::Arc;
327327
328328
fn pnorm(nums: &~[f64], p: uint) -> f64 {
329-
nums.iter().fold(0.0, |a,b| a+(*b).pow(&(p as f64)) ).pow(&(1.0 / (p as f64)))
329+
nums.iter().fold(0.0, |a,b| a+(*b).powf(&(p as f64)) ).powf(&(1.0 / (p as f64)))
330330
}
331331
332332
fn main() {

‎trunk/doc/guide-testing.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ mod tests {
6363
}
6464
~~~
6565

66-
Additionally #[test] items behave as if they also have the
67-
#[cfg(test)] attribute, and will not be compiled when the --test flag
66+
Additionally `#[test]` items behave as if they also have the
67+
`#[cfg(test)]` attribute, and will not be compiled when the --test flag
6868
is not used.
6969

7070
Tests that should not be run can be annotated with the 'ignore'

‎trunk/doc/index.md

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -4,52 +4,54 @@
44
<style type="text/css">
55
#TOC { display: none; }
66
.header-section-number { display: none; }
7+
li {list-style-type: none; }
78
</style>
89

9-
[The Rust tutorial](tutorial.html) ([PDF](tutorial.pdf))
10-
[The Rust reference manual](rust.html) ([PDF](rust.pdf))
10+
* [The Rust tutorial](tutorial.html) (* [PDF](tutorial.pdf))
11+
* [The Rust reference manual](rust.html) (* [PDF](rust.pdf))
1112

1213
# Guides
1314

14-
[Pointers](guide-pointers.html)
15-
[References and Lifetimes](guide-lifetimes.html)
16-
[Containers and Iterators](guide-container.html)
17-
[Tasks and Communication](guide-tasks.html)
18-
[Foreign Function Interface](guide-ffi.html)
19-
[Macros](guide-macros.html)
20-
[Packaging](guide-rustpkg.html)
21-
[Testing](guide-testing.html)
22-
[Conditions](guide-conditions.html)
23-
[Rust's Runtime](guide-runtime.html)
15+
* [Pointers](guide-pointers.html)
16+
* [References and Lifetimes](guide-lifetimes.html)
17+
* [Containers and Iterators](guide-container.html)
18+
* [Tasks and Communication](guide-tasks.html)
19+
* [Foreign Function Interface](guide-ffi.html)
20+
* [Macros](guide-macros.html)
21+
* [Packaging](guide-rustpkg.html)
22+
* [Testing](guide-testing.html)
23+
* [Conditions](guide-conditions.html)
24+
* [Rust's Runtime](guide-runtime.html)
2425

2526
# Libraries
2627

27-
[The standard library, `libstd`](std/index.html)
28-
[The extra library, `libextra`](extra/index.html)
28+
* [The standard library, `libstd`](std/index.html)
29+
* [The extra library, `libextra`](extra/index.html)
2930

30-
[The M:N runtime library, `libgreen`](green/index.html)
31-
[The 1:1 runtime library, `libnative`](native/index.html)
31+
* [The M:N runtime library, `libgreen`](green/index.html)
32+
* [The 1:1 runtime library, `libnative`](native/index.html)
3233

33-
[The Rust libuv library, `librustuv`](rustuv/index.html)
34-
[The Rust packaging library, `librustpkg`](rustpkg/index.html)
34+
* [The Rust libuv library, `librustuv`](rustuv/index.html)
35+
* [The Rust packaging library, `librustpkg`](rustpkg/index.html)
3536

36-
[The Rust parser, `libsyntax`](syntax/index.html)
37-
[The Rust compiler, `librustc`](rustc/index.html)
37+
* [The Rust parser, `libsyntax`](syntax/index.html)
38+
* [The Rust compiler, `librustc`](rustc/index.html)
3839

3940
# Tooling
4041

41-
[The `rustpkg` manual](rustpkg.html)
42+
* [The `rustdoc` manual](rustdoc.html)
43+
* [The `rustpkg` manual](rustpkg.html)
4244

4345
# FAQs
4446

45-
[Language FAQ](complement-lang-faq.html)
46-
[Project FAQ](complement-project-faq.html)
47-
[Usage FAQ](complement-usage-faq.html)
48-
[Code cheatsheet](complement-cheatsheet.html) - "How do I do X?"
49-
[How to submit a bug report](complement-bugreport.html)
47+
* [Language FAQ](complement-lang-faq.html)
48+
* [Project FAQ](complement-project-faq.html)
49+
* [Usage FAQ](complement-usage-faq.html)
50+
* [Code cheatsheet](complement-cheatsheet.html) - "How do I do X?"
51+
* [How to submit a bug report](complement-bugreport.html)
5052

5153
# External resources
5254

53-
The Rust [IRC channel](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust) - `#rust` on irc.mozilla.org
54-
The Rust community on [Reddit](http://reddit.com/r/rust)
55-
The Rust [wiki](http://github.com/mozilla/rust/wiki)
55+
* The Rust [IRC channel](http://chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust) - `#rust` on irc.mozilla.org
56+
* The Rust community on [Reddit](http://reddit.com/r/rust)
57+
* The Rust [wiki](http://github.com/mozilla/rust/wiki)

0 commit comments

Comments
 (0)