Skip to content

Commit fc58479

Browse files
author
Keegan McAllister
committed
Stop using macro_escape as an inner attribute
In preparation for the rename.
1 parent 73806dd commit fc58479

File tree

32 files changed

+55
-47
lines changed

32 files changed

+55
-47
lines changed

src/libcollections/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ pub use vec_map::VecMap;
5454
// Needed for the vec! macro
5555
pub use alloc::boxed;
5656

57+
#[macro_escape]
5758
mod macros;
5859

5960
pub mod binary_heap;

src/libcollections/macros.rs

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

11-
#![macro_escape]
12-
1311
/// Creates a `std::vec::Vec` containing the arguments.
1412
// NOTE: remove after the next snapshot
1513
#[cfg(stage0)]

src/libcore/lib.rs

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,20 @@
6262
#![feature(default_type_params, unboxed_closures, associated_types)]
6363
#![deny(missing_docs)]
6464

65+
#[macro_escape]
6566
mod macros;
6667

67-
#[path = "num/float_macros.rs"] mod float_macros;
68-
#[path = "num/int_macros.rs"] mod int_macros;
69-
#[path = "num/uint_macros.rs"] mod uint_macros;
68+
#[path = "num/float_macros.rs"]
69+
#[macro_escape]
70+
mod float_macros;
71+
72+
#[path = "num/int_macros.rs"]
73+
#[macro_escape]
74+
mod int_macros;
75+
76+
#[path = "num/uint_macros.rs"]
77+
#[macro_escape]
78+
mod uint_macros;
7079

7180
#[path = "num/int.rs"] pub mod int;
7281
#[path = "num/i8.rs"] pub mod i8;

src/libcore/macros.rs

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

11-
#![macro_escape]
12-
1311
/// Entry point of task panic, for details, see std::macros
1412
#[macro_export]
1513
macro_rules! panic {

src/libcore/num/float_macros.rs

Lines changed: 0 additions & 1 deletion
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-
#![macro_escape]
1211
#![doc(hidden)]
1312

1413
macro_rules! assert_approx_eq {

src/libcore/num/int_macros.rs

Lines changed: 0 additions & 1 deletion
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-
#![macro_escape]
1211
#![doc(hidden)]
1312

1413
macro_rules! int_module { ($T:ty, $bits:expr) => (

src/libcore/num/uint_macros.rs

Lines changed: 0 additions & 1 deletion
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-
#![macro_escape]
1211
#![doc(hidden)]
1312

1413
macro_rules! uint_module { ($T:ty, $T_SIGNED:ty, $bits:expr) => (

src/libcoretest/num/int_macros.rs

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

11-
#![macro_escape]
12-
1311
macro_rules! int_module (($T:ty, $T_i:ident) => (
1412
#[cfg(test)]
1513
mod tests {

src/libcoretest/num/mod.rs

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

17+
#[macro_escape]
1718
mod int_macros;
19+
1820
mod i8;
1921
mod i16;
2022
mod i32;
2123
mod i64;
2224
mod int;
25+
26+
#[macro_escape]
2327
mod uint_macros;
28+
2429
mod u8;
2530
mod u16;
2631
mod u32;

src/libcoretest/num/uint_macros.rs

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

11-
#![macro_escape]
12-
1311
macro_rules! uint_module (($T:ty, $T_i:ident) => (
1412
#[cfg(test)]
1513
mod tests {

0 commit comments

Comments
 (0)