Skip to content

Commit 8484315

Browse files
author
Jakub Bukaj
committed
---
yaml --- r: 160991 b: refs/heads/try c: db4d60a h: refs/heads/master i: 160989: e501339 160987: 4e7b0b1 160983: d6baaab 160975: faebd5a 160959: e0587ba v: v3
1 parent e3a47b8 commit 8484315

File tree

600 files changed

+3585
-2742
lines changed

Some content is hidden

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

600 files changed

+3585
-2742
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: 4eb72d268f337a8f117c86a2ac1b98336cab9e9d
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: c9f6d696420107f82304b992cf623b806995fe18
5-
refs/heads/try: 197a0ac481ae6d154c0966b21849432f1b32c28f
5+
refs/heads/try: db4d60afb0d17c9bff72bb7b6c3754c0e6d3f2b5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
88
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

‎branches/try/src/compiletest/common.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
10+
pub use self::Mode::*;
1011

1112
use std::fmt;
1213
use std::str::FromStr;

‎branches/try/src/compiletest/compiletest.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// except according to those terms.
1010

1111
#![crate_type = "bin"]
12-
#![feature(phase, slicing_syntax)]
12+
#![feature(phase, slicing_syntax, globs)]
1313

1414
#![deny(warnings)]
1515

‎branches/try/src/compiletest/runtest.rs

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
10+
#[cfg(not(stage0))]
11+
use self::TargetLocation::*;
1012

1113
use common::Config;
1214
use common::{CompileFail, Pretty, RunFail, RunPass, RunPassValgrind, DebugInfoGdb};
@@ -399,7 +401,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
399401
procsrv::run("",
400402
config.adb_path.as_slice(),
401403
None,
402-
[
404+
&[
403405
"push".to_string(),
404406
exe_file.as_str().unwrap().to_string(),
405407
config.adb_test_dir.clone()
@@ -411,7 +413,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
411413
procsrv::run("",
412414
config.adb_path.as_slice(),
413415
None,
414-
[
416+
&[
415417
"forward".to_string(),
416418
"tcp:5039".to_string(),
417419
"tcp:5039".to_string()
@@ -432,7 +434,7 @@ fn run_debuginfo_gdb_test(config: &Config, props: &TestProps, testfile: &Path) {
432434
config.adb_path
433435
.as_slice(),
434436
None,
435-
[
437+
&[
436438
"shell".to_string(),
437439
adb_arg.clone()
438440
],
@@ -746,7 +748,7 @@ fn run_debuginfo_lldb_test(config: &Config, props: &TestProps, testfile: &Path)
746748
cmd.arg(lldb_script_path)
747749
.arg(test_executable)
748750
.arg(debugger_script)
749-
.env_set_all([("PYTHONPATH", config.lldb_python_dir.clone().unwrap().as_slice())]);
751+
.env_set_all(&[("PYTHONPATH", config.lldb_python_dir.clone().unwrap().as_slice())]);
750752

751753
let (status, out, err) = match cmd.spawn() {
752754
Ok(process) => {
@@ -1142,11 +1144,11 @@ struct ProcRes {
11421144

11431145
fn compile_test(config: &Config, props: &TestProps,
11441146
testfile: &Path) -> ProcRes {
1145-
compile_test_(config, props, testfile, [])
1147+
compile_test_(config, props, testfile, &[])
11461148
}
11471149

11481150
fn jit_test(config: &Config, props: &TestProps, testfile: &Path) -> ProcRes {
1149-
compile_test_(config, props, testfile, ["--jit".to_string()])
1151+
compile_test_(config, props, testfile, &["--jit".to_string()])
11501152
}
11511153

11521154
fn compile_test_(config: &Config, props: &TestProps,
@@ -1507,7 +1509,7 @@ fn _arm_exec_compiled_test(config: &Config,
15071509
let copy_result = procsrv::run("",
15081510
config.adb_path.as_slice(),
15091511
None,
1510-
[
1512+
&[
15111513
"push".to_string(),
15121514
args.prog.clone(),
15131515
config.adb_test_dir.clone()
@@ -1624,7 +1626,7 @@ fn _arm_push_aux_shared_library(config: &Config, testfile: &Path) {
16241626
let copy_result = procsrv::run("",
16251627
config.adb_path.as_slice(),
16261628
None,
1627-
[
1629+
&[
16281630
"push".to_string(),
16291631
file.as_str()
16301632
.unwrap()

‎branches/try/src/doc/guide-lifetimes.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,8 @@ copying.
308308
# }
309309
fn compute_area(shape: &Shape) -> f64 {
310310
match *shape {
311-
Circle(_, radius) => std::f64::consts::PI * radius * radius,
312-
Rectangle(_, ref size) => size.w * size.h
311+
Shape::Circle(_, radius) => std::f64::consts::PI * radius * radius,
312+
Shape::Rectangle(_, ref size) => size.w * size.h
313313
}
314314
}
315315
~~~
@@ -478,14 +478,14 @@ example:
478478
# a: &'r T, b: &'r T) -> &'r T {
479479
# if compute_area(shape) > threshold {a} else {b}
480480
# }
481-
// -+ r
482-
fn select_based_on_unit_circle<'r, T>( // |-+ B
483-
threshold: f64, a: &'r T, b: &'r T) -> &'r T { // | |
484-
// | |
485-
let shape = Circle(Point {x: 0., y: 0.}, 1.); // | |
486-
select(&shape, threshold, a, b) // | |
487-
} // |-+
488-
// -+
481+
// -+ r
482+
fn select_based_on_unit_circle<'r, T>( // |-+ B
483+
threshold: f64, a: &'r T, b: &'r T) -> &'r T { // | |
484+
// | |
485+
let shape = Shape::Circle(Point {x: 0., y: 0.}, 1.); // | |
486+
select(&shape, threshold, a, b) // | |
487+
} // |-+
488+
// -+
489489
~~~
490490

491491
In this call to `select()`, the lifetime of the first parameter shape

‎branches/try/src/doc/guide-macros.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ doing nothing otherwise:
2222
~~~~
2323
# enum T { SpecialA(uint), SpecialB(uint) }
2424
# fn f() -> uint {
25-
# let input_1 = SpecialA(0);
26-
# let input_2 = SpecialA(0);
25+
# let input_1 = T::SpecialA(0);
26+
# let input_2 = T::SpecialA(0);
2727
match input_1 {
28-
SpecialA(x) => { return x; }
28+
T::SpecialA(x) => { return x; }
2929
_ => {}
3030
}
3131
// ...
3232
match input_2 {
33-
SpecialB(x) => { return x; }
33+
T::SpecialB(x) => { return x; }
3434
_ => {}
3535
}
3636
# return 0u;
@@ -49,20 +49,20 @@ the pattern in the above code:
4949
# #![feature(macro_rules)]
5050
# enum T { SpecialA(uint), SpecialB(uint) }
5151
# fn f() -> uint {
52-
# let input_1 = SpecialA(0);
53-
# let input_2 = SpecialA(0);
52+
# let input_1 = T::SpecialA(0);
53+
# let input_2 = T::SpecialA(0);
5454
macro_rules! early_return(
55-
($inp:expr $sp:ident) => ( // invoke it like `(input_5 SpecialE)`
55+
($inp:expr $sp:path) => ( // invoke it like `(input_5 SpecialE)`
5656
match $inp {
5757
$sp(x) => { return x; }
5858
_ => {}
5959
}
6060
);
6161
)
6262
// ...
63-
early_return!(input_1 SpecialA);
63+
early_return!(input_1 T::SpecialA);
6464
// ...
65-
early_return!(input_2 SpecialB);
65+
early_return!(input_2 T::SpecialB);
6666
# return 0;
6767
# }
6868
# fn main() {}
@@ -169,10 +169,10 @@ instead of `*` to mean "at least one".
169169
# #![feature(macro_rules)]
170170
# enum T { SpecialA(uint),SpecialB(uint),SpecialC(uint),SpecialD(uint)}
171171
# fn f() -> uint {
172-
# let input_1 = SpecialA(0);
173-
# let input_2 = SpecialA(0);
172+
# let input_1 = T::SpecialA(0);
173+
# let input_2 = T::SpecialA(0);
174174
macro_rules! early_return(
175-
($inp:expr, [ $($sp:ident)|+ ]) => (
175+
($inp:expr, [ $($sp:path)|+ ]) => (
176176
match $inp {
177177
$(
178178
$sp(x) => { return x; }
@@ -182,9 +182,9 @@ macro_rules! early_return(
182182
);
183183
)
184184
// ...
185-
early_return!(input_1, [SpecialA|SpecialC|SpecialD]);
185+
early_return!(input_1, [T::SpecialA|T::SpecialC|T::SpecialD]);
186186
// ...
187-
early_return!(input_2, [SpecialB]);
187+
early_return!(input_2, [T::SpecialB]);
188188
# return 0;
189189
# }
190190
# fn main() {}
@@ -234,9 +234,9 @@ Now consider code like the following:
234234
# enum T3 { Good2(uint), Bad2}
235235
# fn f(x: T1) -> uint {
236236
match x {
237-
Good1(g1, val) => {
237+
T1::Good1(g1, val) => {
238238
match g1.body {
239-
Good2(result) => {
239+
T3::Good2(result) => {
240240
// complicated stuff goes here
241241
return result + val;
242242
},
@@ -281,9 +281,9 @@ macro_rules! biased_match (
281281
# struct T2 { body: T3 }
282282
# enum T3 { Good2(uint), Bad2}
283283
# fn f(x: T1) -> uint {
284-
biased_match!((x) ~ (Good1(g1, val)) else { return 0 };
284+
biased_match!((x) ~ (T1::Good1(g1, val)) else { return 0 };
285285
binds g1, val )
286-
biased_match!((g1.body) ~ (Good2(result) )
286+
biased_match!((g1.body) ~ (T3::Good2(result) )
287287
else { panic!("Didn't get good_2") };
288288
binds result )
289289
// complicated stuff goes here
@@ -396,8 +396,8 @@ macro_rules! biased_match (
396396
# enum T3 { Good2(uint), Bad2}
397397
# fn f(x: T1) -> uint {
398398
biased_match!(
399-
(x) ~ (Good1(g1, val)) else { return 0 };
400-
(g1.body) ~ (Good2(result) ) else { panic!("Didn't get Good2") };
399+
(x) ~ (T1::Good1(g1, val)) else { return 0 };
400+
(g1.body) ~ (T3::Good2(result) ) else { panic!("Didn't get Good2") };
401401
binds val, result )
402402
// complicated stuff goes here
403403
return result + val;

‎branches/try/src/doc/guide-pointers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ enum List<T> {
598598
}
599599
600600
fn main() {
601-
let list: List<int> = Cons(1, box Cons(2, box Cons(3, box Nil)));
601+
let list: List<int> = List::Cons(1, box List::Cons(2, box List::Cons(3, box List::Nil)));
602602
println!("{}", list);
603603
}
604604
```

‎branches/try/src/doc/guide-testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ will be counted as a failure. For example:
8484
#[test]
8585
#[should_fail]
8686
fn test_out_of_bounds_failure() {
87-
let v: &[int] = [];
87+
let v: &[int] = &[];
8888
v[0];
8989
}
9090
~~~

‎branches/try/src/doc/guide.md

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1263,17 +1263,17 @@ enum OptionalInt {
12631263
}
12641264
12651265
fn main() {
1266-
let x = Value(5);
1267-
let y = Missing;
1266+
let x = OptionalInt::Value(5);
1267+
let y = OptionalInt::Missing;
12681268
12691269
match x {
1270-
Value(n) => println!("x is {}", n),
1271-
Missing => println!("x is missing!"),
1270+
OptionalInt::Value(n) => println!("x is {}", n),
1271+
OptionalInt::Missing => println!("x is missing!"),
12721272
}
12731273
12741274
match y {
1275-
Value(n) => println!("y is {}", n),
1276-
Missing => println!("y is missing!"),
1275+
OptionalInt::Value(n) => println!("y is {}", n),
1276+
OptionalInt::Missing => println!("y is missing!"),
12771277
}
12781278
}
12791279
```
@@ -1702,17 +1702,17 @@ enum OptionalInt {
17021702
}
17031703
17041704
fn main() {
1705-
let x = Value(5);
1706-
let y = Missing;
1705+
let x = OptionalInt::Value(5);
1706+
let y = OptionalInt::Missing;
17071707
17081708
match x {
1709-
Value(n) => println!("x is {}", n),
1710-
Missing => println!("x is missing!"),
1709+
OptionalInt::Value(n) => println!("x is {}", n),
1710+
OptionalInt::Missing => println!("x is missing!"),
17111711
}
17121712
17131713
match y {
1714-
Value(n) => println!("y is {}", n),
1715-
Missing => println!("y is missing!"),
1714+
OptionalInt::Value(n) => println!("y is {}", n),
1715+
OptionalInt::Missing => println!("y is missing!"),
17161716
}
17171717
}
17181718
```
@@ -3709,7 +3709,7 @@ enum List {
37093709
}
37103710
37113711
fn main() {
3712-
let list = Node(0, box Node(1, box Nil));
3712+
let list = List::Node(0, box List::Node(1, box List::Nil));
37133713
}
37143714
```
37153715

@@ -3895,11 +3895,11 @@ enum OptionalInt {
38953895
Missing,
38963896
}
38973897
3898-
let x = Value(5i);
3898+
let x = OptionalInt::Value(5i);
38993899
39003900
match x {
3901-
Value(..) => println!("Got an int!"),
3902-
Missing => println!("No such luck."),
3901+
OptionalInt::Value(..) => println!("Got an int!"),
3902+
OptionalInt::Missing => println!("No such luck."),
39033903
}
39043904
```
39053905

@@ -3911,12 +3911,12 @@ enum OptionalInt {
39113911
Missing,
39123912
}
39133913
3914-
let x = Value(5i);
3914+
let x = OptionalInt::Value(5i);
39153915
39163916
match x {
3917-
Value(i) if i > 5 => println!("Got an int bigger than five!"),
3918-
Value(..) => println!("Got an int!"),
3919-
Missing => println!("No such luck."),
3917+
OptionalInt::Value(i) if i > 5 => println!("Got an int bigger than five!"),
3918+
OptionalInt::Value(..) => println!("Got an int!"),
3919+
OptionalInt::Missing => println!("No such luck."),
39203920
}
39213921
```
39223922

0 commit comments

Comments
 (0)