Skip to content

Commit c5aeb80

Browse files
author
Div Shekhar
committed
---
yaml --- r: 148400 b: refs/heads/try2 c: 065f936 h: refs/heads/master v: v3
1 parent bba374c commit c5aeb80

File tree

227 files changed

+5502
-7585
lines changed

Some content is hidden

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

227 files changed

+5502
-7585
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: dbce62c6bbcb58e19e467f7aa4e15fc5628926d3
8+
refs/heads/try2: 065f936bf153f482e10779ebd45b077035a578e0
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

‎branches/try2/Makefile.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -371,9 +371,6 @@ 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-
377374
define DEF_LLVM_VARS
378375
# The configure script defines these variables with the target triples
379376
# separated by Z. This defines new ones with the expected format.

‎branches/try2/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::BufferedReader;
66-
# use std::io::MemReader;
65+
use std::io::buffered::BufferedReader;
66+
# use std::io::mem::MemReader;
6767
6868
# let reader = MemReader::new(~[]);
6969

‎branches/try2/doc/guide-conditions.md

Lines changed: 27 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,12 @@ An example program that does this task reads like this:
4646
~~~~
4747
# #[allow(unused_imports)];
4848
# extern mod extra;
49-
use std::io::{BufferedReader, File};
49+
use std::io::buffered::BufferedReader;
50+
use std::io::File;
5051
# mod BufferedReader {
5152
# use std::io::File;
52-
# use std::io::MemReader;
53-
# use std::io::BufferedReader;
53+
# use std::io::mem::MemReader;
54+
# use std::io::buffered::BufferedReader;
5455
# static s : &'static [u8] = bytes!("1 2\n\
5556
# 34 56\n\
5657
# 789 123\n\
@@ -244,12 +245,13 @@ and trapping its exit status using `task::try`:
244245
~~~~
245246
# #[allow(unused_imports)];
246247
# extern mod extra;
247-
use std::io::{BufferedReader, File};
248+
use std::io::buffered::BufferedReader;
249+
use std::io::File;
248250
use std::task;
249251
# mod BufferedReader {
250252
# use std::io::File;
251-
# use std::io::MemReader;
252-
# use std::io::BufferedReader;
253+
# use std::io::mem::MemReader;
254+
# use std::io::buffered::BufferedReader;
253255
# static s : &'static [u8] = bytes!("1 2\n\
254256
# 34 56\n\
255257
# 789 123\n\
@@ -348,11 +350,12 @@ but similarly clear as the version that used `fail!` in the logic where the erro
348350
~~~~
349351
# #[allow(unused_imports)];
350352
# extern mod extra;
351-
use std::io::{BufferedReader, File};
353+
use std::io::buffered::BufferedReader;
354+
use std::io::File;
352355
# mod BufferedReader {
353356
# use std::io::File;
354-
# use std::io::MemReader;
355-
# use std::io::BufferedReader;
357+
# use std::io::mem::MemReader;
358+
# use std::io::buffered::BufferedReader;
356359
# static s : &'static [u8] = bytes!("1 2\n\
357360
# 34 56\n\
358361
# 789 123\n\
@@ -417,11 +420,12 @@ and replaces bad input lines with the pair `(-1,-1)`:
417420
~~~~
418421
# #[allow(unused_imports)];
419422
# extern mod extra;
420-
use std::io::{BufferedReader, File};
423+
use std::io::buffered::BufferedReader;
424+
use std::io::File;
421425
# mod BufferedReader {
422426
# use std::io::File;
423-
# use std::io::MemReader;
424-
# use std::io::BufferedReader;
427+
# use std::io::mem::MemReader;
428+
# use std::io::buffered::BufferedReader;
425429
# static s : &'static [u8] = bytes!("1 2\n\
426430
# 34 56\n\
427431
# 789 123\n\
@@ -492,11 +496,12 @@ Changing the condition's return type from `(int,int)` to `Option<(int,int)>` wil
492496
~~~~
493497
# #[allow(unused_imports)];
494498
# extern mod extra;
495-
use std::io::{BufferedReader, File};
499+
use std::io::buffered::BufferedReader;
500+
use std::io::File;
496501
# mod BufferedReader {
497502
# use std::io::File;
498-
# use std::io::MemReader;
499-
# use std::io::BufferedReader;
503+
# use std::io::mem::MemReader;
504+
# use std::io::buffered::BufferedReader;
500505
# static s : &'static [u8] = bytes!("1 2\n\
501506
# 34 56\n\
502507
# 789 123\n\
@@ -577,11 +582,12 @@ This can be encoded in the handler API by introducing a helper type: `enum Malfo
577582
~~~~
578583
# #[allow(unused_imports)];
579584
# extern mod extra;
585+
use std::io::buffered::BufferedReader;
580586
use std::io::File;
581587
# mod BufferedReader {
582588
# use std::io::File;
583-
# use std::io::MemReader;
584-
# use std::io::BufferedReader;
589+
# use std::io::mem::MemReader;
590+
# use std::io::buffered::BufferedReader;
585591
# static s : &'static [u8] = bytes!("1 2\n\
586592
# 34 56\n\
587593
# 789 123\n\
@@ -701,11 +707,12 @@ a second condition and a helper function will suffice:
701707
~~~~
702708
# #[allow(unused_imports)];
703709
# extern mod extra;
704-
use std::io::{BufferedReader, File};
710+
use std::io::buffered::BufferedReader;
711+
use std::io::File;
705712
# mod BufferedReader {
706713
# use std::io::File;
707-
# use std::io::MemReader;
708-
# use std::io::BufferedReader;
714+
# use std::io::mem::MemReader;
715+
# use std::io::buffered::BufferedReader;
709716
# static s : &'static [u8] = bytes!("1 2\n\
710717
# 34 56\n\
711718
# 789 123\n\

‎branches/try2/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).powf(&-2.0);
293+
local_sum += (num as f64 + 1.0).pow(&-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).powf(&(p as f64)) ).powf(&(1.0 / (p as f64)))
329+
nums.iter().fold(0.0, |a,b| a+(*b).pow(&(p as f64)) ).pow(&(1.0 / (p as f64)))
330330
}
331331
332332
fn main() {

‎branches/try2/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'

‎branches/try2/doc/index.md

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

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

1312
# Guides
1413

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)
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)
2524

2625
# Libraries
2726

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

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

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

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

4039
# Tooling
4140

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

4543
# FAQs
4644

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)
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)
5250

5351
# External resources
5452

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)
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)

0 commit comments

Comments
 (0)