Skip to content

Commit f028a4d

Browse files
sfacklersfackler
committed
---
yaml --- r: 159676 b: refs/heads/auto c: 3dcd215 h: refs/heads/master v: v3
1 parent 5012ab3 commit f028a4d

File tree

485 files changed

+1725
-1121
lines changed

Some content is hidden

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

485 files changed

+1725
-1121
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 88c743def3cf42ee943ca09dda1e6dccf4894db9
13+
refs/heads/auto: 3dcd2157403163789aaf21a9ab3c4d30a7c6494d
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

‎branches/auto/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/auto/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/auto/src/compiletest/runtest.rs

Lines changed: 2 additions & 0 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};

‎branches/auto/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/auto/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/auto/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/auto/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

‎branches/auto/src/doc/reference.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,8 +1331,8 @@ enum Animal {
13311331
Cat
13321332
}
13331333
1334-
let mut a: Animal = Dog;
1335-
a = Cat;
1334+
let mut a: Animal = Animal::Dog;
1335+
a = Animal::Cat;
13361336
```
13371337

13381338
Enumeration constructors can have either named or unnamed fields:
@@ -1345,8 +1345,8 @@ enum Animal {
13451345
Cat { name: String, weight: f64 }
13461346
}
13471347
1348-
let mut a: Animal = Dog("Cocoa".to_string(), 37.2);
1349-
a = Cat { name: "Spotty".to_string(), weight: 2.7 };
1348+
let mut a: Animal = Animal::Dog("Cocoa".to_string(), 37.2);
1349+
a = Animal::Cat { name: "Spotty".to_string(), weight: 2.7 };
13501350
# }
13511351
```
13521352

@@ -3308,12 +3308,12 @@ fields of a particular variant. For example:
33083308
```
33093309
enum List<X> { Nil, Cons(X, Box<List<X>>) }
33103310
3311-
let x: List<int> = Cons(10, box Cons(11, box Nil));
3311+
let x: List<int> = List::Cons(10, box List::Cons(11, box List::Nil));
33123312
33133313
match x {
3314-
Cons(_, box Nil) => panic!("singleton list"),
3315-
Cons(..) => return,
3316-
Nil => panic!("empty list")
3314+
List::Cons(_, box List::Nil) => panic!("singleton list"),
3315+
List::Cons(..) => return,
3316+
List::Nil => panic!("empty list")
33173317
}
33183318
```
33193319

@@ -3371,16 +3371,16 @@ An example of a `match` expression:
33713371
33723372
enum List<X> { Nil, Cons(X, Box<List<X>>) }
33733373
3374-
let x: List<int> = Cons(10, box Cons(11, box Nil));
3374+
let x: List<int> = List::Cons(10, box List::Cons(11, box List::Nil));
33753375
33763376
match x {
3377-
Cons(a, box Cons(b, _)) => {
3377+
List::Cons(a, box List::Cons(b, _)) => {
33783378
process_pair(a, b);
33793379
}
3380-
Cons(10, _) => {
3380+
List::Cons(10, _) => {
33813381
process_ten();
33823382
}
3383-
Nil => {
3383+
List::Nil => {
33843384
return;
33853385
}
33863386
_ => {
@@ -3402,18 +3402,18 @@ enum List { Nil, Cons(uint, Box<List>) }
34023402
34033403
fn is_sorted(list: &List) -> bool {
34043404
match *list {
3405-
Nil | Cons(_, box Nil) => true,
3406-
Cons(x, ref r @ box Cons(_, _)) => {
3405+
List::Nil | List::Cons(_, box List::Nil) => true,
3406+
List::Cons(x, ref r @ box List::Cons(_, _)) => {
34073407
match *r {
3408-
box Cons(y, _) => (x <= y) && is_sorted(&**r),
3408+
box List::Cons(y, _) => (x <= y) && is_sorted(&**r),
34093409
_ => panic!()
34103410
}
34113411
}
34123412
}
34133413
}
34143414
34153415
fn main() {
3416-
let a = Cons(6, box Cons(7, box Cons(42, box Nil)));
3416+
let a = List::Cons(6, box List::Cons(7, box List::Cons(42, box List::Nil)));
34173417
assert!(is_sorted(&a));
34183418
}
34193419
@@ -3718,7 +3718,7 @@ enum List<T> {
37183718
Cons(T, Box<List<T>>)
37193719
}
37203720
3721-
let a: List<int> = Cons(7, box Cons(13, box Nil));
3721+
let a: List<int> = List::Cons(7, box List::Cons(13, box List::Nil));
37223722
```
37233723

37243724
### Pointer types

‎branches/auto/src/etc/unicode.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -391,6 +391,7 @@ def emit_conversions_module(f, lowerupper, upperlower):
391391
def emit_grapheme_module(f, grapheme_table, grapheme_cats):
392392
f.write("""pub mod grapheme {
393393
use core::slice::SlicePrelude;
394+
pub use self::GraphemeCat::*;
394395
use core::slice;
395396
396397
#[allow(non_camel_case_types)]

‎branches/auto/src/libcollections/btree/map.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,11 @@
1515
// writing (August 2014) freely licensed under the following Creative Commons Attribution
1616
// License: [CC BY 2.5 CA](http://creativecommons.org/licenses/by/2.5/ca/).
1717

18+
pub use self::Entry::*;
19+
1820
use core::prelude::*;
1921

22+
use self::StackOp::*;
2023
use super::node::*;
2124
use std::hash::{Writer, Hash};
2225
use core::default::Default;
@@ -445,6 +448,7 @@ impl<K: Ord, V> BTreeMap<K, V> {
445448
/// to nodes. By using this module much better safety guarantees can be made, and more search
446449
/// boilerplate gets cut out.
447450
mod stack {
451+
pub use self::PushResult::*;
448452
use core::prelude::*;
449453
use super::BTreeMap;
450454
use super::super::node::*;

0 commit comments

Comments
 (0)