Skip to content

Commit ee33779

Browse files
alexcrichtonalexcrichton
committed
---
yaml --- r: 172022 b: refs/heads/beta c: e2f97f5 h: refs/heads/master v: v3
1 parent f28e5ce commit ee33779

File tree

60 files changed

+95
-6420
lines changed

Some content is hidden

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

60 files changed

+95
-6420
lines changed

‎[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@ refs/heads/automation-fail: 1bf06495443584539b958873e04cc2f864ab10e4
3131
refs/heads/issue-18208-method-dispatch-3-quick-reject: 2009f85b9f99dedcec4404418eda9ddba90258a2
3232
refs/heads/batch: b5571ed71a5879c0495a982506258d5d267744ed
3333
refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
34-
refs/heads/beta: 5c3ddcb15dc8b40fa780a38fd7494b9b5b991d09
34+
refs/heads/beta: e2f97f51ad4cf902e5a5835b5332447fe59089c4
3535
refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928

‎branches/beta/src/compiletest/compiletest.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,8 @@
1616
extern crate test;
1717
extern crate getopts;
1818

19-
#[cfg(stage0)]
20-
#[phase(plugin, link)]
21-
extern crate log;
22-
23-
#[cfg(not(stage0))]
2419
#[macro_use]
2520
extern crate log;
26-
2721
extern crate regex;
2822

2923
use std::os;

‎branches/beta/src/liballoc/lib.rs

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -65,36 +65,16 @@
6565

6666
#![no_std]
6767
#![allow(unknown_features)]
68-
#![feature(lang_items, phase, unsafe_destructor, default_type_params, old_orphan_check)]
69-
#![feature(associated_types)]
68+
#![feature(lang_items, phase, unsafe_destructor)]
7069

71-
#[cfg(stage0)]
72-
#[phase(plugin, link)]
73-
extern crate core;
74-
75-
#[cfg(not(stage0))]
7670
#[macro_use]
7771
extern crate core;
78-
7972
extern crate libc;
8073

8174
// Allow testing this library
8275

83-
#[cfg(all(test, stage0))]
84-
#[phase(plugin, link)]
85-
extern crate std;
86-
87-
#[cfg(all(test, not(stage0)))]
88-
#[macro_use]
89-
extern crate std;
90-
91-
#[cfg(all(test, stage0))]
92-
#[phase(plugin, link)]
93-
extern crate log;
94-
95-
#[cfg(all(test, not(stage0)))]
96-
#[macro_use]
97-
extern crate log;
76+
#[cfg(test)] #[macro_use] extern crate std;
77+
#[cfg(test)] #[macro_use] extern crate log;
9878

9979
// Heaps provided for low-level allocation strategies
10080

‎branches/beta/src/libcollections/lib.rs

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -21,42 +21,18 @@
2121
html_root_url = "http://doc.rust-lang.org/nightly/",
2222
html_playground_url = "http://play.rust-lang.org/")]
2323

24-
#![allow(unknown_features)]
25-
#![feature(macro_rules, default_type_params, phase, globs)]
2624
#![feature(unsafe_destructor, slicing_syntax)]
27-
#![feature(unboxed_closures)]
28-
#![feature(old_orphan_check)]
29-
#![feature(associated_types)]
3025
#![no_std]
3126

32-
#[cfg(stage0)]
33-
#[phase(plugin, link)]
34-
extern crate core;
35-
36-
#[cfg(not(stage0))]
3727
#[macro_use]
3828
extern crate core;
3929

4030
extern crate unicode;
4131
extern crate alloc;
4232

4333
#[cfg(test)] extern crate test;
44-
45-
#[cfg(all(test, stage0))]
46-
#[phase(plugin, link)]
47-
extern crate std;
48-
49-
#[cfg(all(test, not(stage0)))]
50-
#[macro_use]
51-
extern crate std;
52-
53-
#[cfg(all(test, stage0))]
54-
#[phase(plugin, link)]
55-
extern crate log;
56-
57-
#[cfg(all(test, not(stage0)))]
58-
#[macro_use]
59-
extern crate log;
34+
#[cfg(test)] #[macro_use] extern crate std;
35+
#[cfg(test)] #[macro_use] extern crate log;
6036

6137
pub use binary_heap::BinaryHeap;
6238
pub use bitv::Bitv;
@@ -73,8 +49,7 @@ pub use vec_map::VecMap;
7349
// Needed for the vec! macro
7450
pub use alloc::boxed;
7551

76-
#[cfg_attr(stage0, macro_escape)]
77-
#[cfg_attr(not(stage0), macro_use)]
52+
#[macro_use]
7853
mod macros;
7954

8055
pub mod binary_heap;

‎branches/beta/src/libcollections/macros.rs

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,7 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
/// Creates a `std::vec::Vec` containing the arguments.
12-
// NOTE: remove after the next snapshot
13-
#[cfg(stage0)]
14-
macro_rules! vec {
15-
($($e:expr),*) => ({
16-
// leading _ to allow empty construction without a warning.
17-
let mut _temp = ::vec::Vec::new();
18-
$(_temp.push($e);)*
19-
_temp
20-
});
21-
($($e:expr),+,) => (vec!($($e),+))
22-
}
23-
2411
/// Creates a `Vec` containing the arguments.
25-
#[cfg(not(stage0))]
2612
#[macro_export]
2713
macro_rules! vec {
2814
($($x:expr),*) => ({

‎branches/beta/src/libcore/fmt/mod.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ use slice::SliceExt;
2727
use slice;
2828
use str::{self, StrExt, Utf8Error};
2929

30-
// NOTE: for old macros; remove after the next snapshot
31-
#[cfg(stage0)] use result::Result::Err;
32-
3330
pub use self::num::radix;
3431
pub use self::num::Radix;
3532
pub use self::num::RadixFmt;

‎branches/beta/src/libcore/lib.rs

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,29 +56,25 @@
5656
html_playground_url = "http://play.rust-lang.org/")]
5757

5858
#![no_std]
59-
#![allow(unknown_features, raw_pointer_deriving)]
60-
#![feature(globs, intrinsics, lang_items, macro_rules, phase)]
59+
#![allow(unknown_features, raw_pointer_derive)]
60+
#![feature(intrinsics, lang_items)]
6161
#![feature(simd, unsafe_destructor, slicing_syntax)]
62-
#![feature(default_type_params, unboxed_closures, associated_types)]
62+
#![feature(unboxed_closures)]
6363
#![deny(missing_docs)]
6464

65-
#[cfg_attr(stage0, macro_escape)]
66-
#[cfg_attr(not(stage0), macro_use)]
65+
#[macro_use]
6766
mod macros;
6867

6968
#[path = "num/float_macros.rs"]
70-
#[cfg_attr(stage0, macro_escape)]
71-
#[cfg_attr(not(stage0), macro_use)]
69+
#[macro_use]
7270
mod float_macros;
7371

7472
#[path = "num/int_macros.rs"]
75-
#[cfg_attr(stage0, macro_escape)]
76-
#[cfg_attr(not(stage0), macro_use)]
73+
#[macro_use]
7774
mod int_macros;
7875

7976
#[path = "num/uint_macros.rs"]
80-
#[cfg_attr(stage0, macro_escape)]
81-
#[cfg_attr(not(stage0), macro_use)]
77+
#[macro_use]
8278
mod uint_macros;
8379

8480
#[path = "num/int.rs"] pub mod int;

‎branches/beta/src/libcore/macros.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -142,16 +142,9 @@ macro_rules! debug_assert_eq {
142142
($($arg:tt)*) => (if cfg!(not(ndebug)) { assert_eq!($($arg)*); })
143143
}
144144

145-
#[cfg(stage0)]
146-
#[macro_export]
147-
macro_rules! try {
148-
($e:expr) => (match $e { Ok(e) => e, Err(e) => return Err(e) })
149-
}
150-
151145
/// Short circuiting evaluation on Err
152146
///
153147
/// `libstd` contains a more general `try!` macro that uses `FromError`.
154-
#[cfg(not(stage0))]
155148
#[macro_export]
156149
macro_rules! try {
157150
($e:expr) => ({

‎branches/beta/src/libcoretest/num/mod.rs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ use core::num::{NumCast, cast};
1414
use core::ops::{Add, Sub, Mul, Div, Rem};
1515
use core::kinds::Copy;
1616

17-
#[cfg_attr(stage0, macro_escape)]
18-
#[cfg_attr(not(stage0), macro_use)]
17+
#[macro_use]
1918
mod int_macros;
2019

2120
mod i8;
@@ -24,8 +23,7 @@ mod i32;
2423
mod i64;
2524
mod int;
2625

27-
#[cfg_attr(stage0, macro_escape)]
28-
#[cfg_attr(not(stage0), macro_use)]
26+
#[macro_use]
2927
mod uint_macros;
3028

3129
mod u8;

‎branches/beta/src/libflate/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
2222
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
2323
html_root_url = "http://doc.rust-lang.org/nightly/")]
24-
#![feature(unboxed_closures, associated_types)]
2524

2625
#[cfg(test)] #[macro_use] extern crate log;
2726

‎branches/beta/src/libfmt_macros/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@
2323
html_root_url = "http://doc.rust-lang.org/nightly/",
2424
html_playground_url = "http://play.rust-lang.org/")]
2525

26-
#![feature(globs, slicing_syntax)]
27-
#![feature(associated_types)]
26+
#![feature(slicing_syntax)]
2827

2928
pub use self::Piece::*;
3029
pub use self::Position::*;

‎branches/beta/src/libgetopts/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@
8585
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
8686
html_root_url = "http://doc.rust-lang.org/nightly/",
8787
html_playground_url = "http://play.rust-lang.org/")]
88-
#![feature(globs, slicing_syntax)]
89-
#![feature(unboxed_closures)]
88+
#![feature(slicing_syntax)]
9089
#![deny(missing_docs)]
9190

9291
#[cfg(test)] #[macro_use] extern crate log;

‎branches/beta/src/libgraphviz/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,8 +271,7 @@
271271
#![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
272272
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
273273
html_root_url = "http://doc.rust-lang.org/nightly/")]
274-
#![feature(globs, slicing_syntax)]
275-
#![feature(unboxed_closures)]
274+
#![feature(slicing_syntax)]
276275

277276
use self::LabelText::*;
278277

‎branches/beta/src/liblibc/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
#![feature(globs)]
1211
#![crate_name = "libc"]
1312
#![experimental]
1413
#![no_std] // we don't need std, and we can't have std, since it doesn't exist
@@ -76,7 +75,7 @@
7675
#![allow(non_upper_case_globals)]
7776
#![allow(missing_docs)]
7877
#![allow(non_snake_case)]
79-
#![allow(raw_pointer_deriving)]
78+
#![allow(raw_pointer_derive)]
8079

8180
extern crate core;
8281

‎branches/beta/src/liblog/lib.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
164164
html_root_url = "http://doc.rust-lang.org/nightly/",
165165
html_playground_url = "http://play.rust-lang.org/")]
166-
#![feature(macro_rules, unboxed_closures, slicing_syntax)]
166+
#![feature(slicing_syntax)]
167167
#![deny(missing_docs)]
168168

169169
extern crate regex;
@@ -182,8 +182,7 @@ use regex::Regex;
182182

183183
use directive::LOG_LEVEL_NAMES;
184184

185-
#[cfg_attr(stage0, macro_escape)]
186-
#[cfg_attr(not(stage0), macro_use)]
185+
#[macro_use]
187186
pub mod macros;
188187

189188
mod directive;

‎branches/beta/src/librand/lib.rs

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,35 +23,14 @@
2323
html_root_url = "http://doc.rust-lang.org/nightly/",
2424
html_playground_url = "http://play.rust-lang.org/")]
2525

26-
#![feature(macro_rules, phase, globs)]
27-
#![feature(unboxed_closures)]
28-
#![feature(associated_types)]
2926
#![no_std]
3027
#![experimental]
3128

32-
#[cfg(stage0)]
33-
#[phase(plugin, link)]
34-
extern crate core;
35-
36-
#[cfg(not(stage0))]
3729
#[macro_use]
3830
extern crate core;
3931

40-
#[cfg(all(test, stage0))]
41-
#[phase(plugin, link)]
42-
extern crate std;
43-
44-
#[cfg(all(test, not(stage0)))]
45-
#[macro_use]
46-
extern crate std;
47-
48-
#[cfg(all(test, stage0))]
49-
#[phase(plugin, link)]
50-
extern crate log;
51-
52-
#[cfg(all(test, not(stage0)))]
53-
#[macro_use]
54-
extern crate log;
32+
#[cfg(test)] #[macro_use] extern crate std;
33+
#[cfg(test)] #[macro_use] extern crate log;
5534

5635
use core::prelude::*;
5736

0 commit comments

Comments
 (0)