diff options
| author | Keegan McAllister <kmcallister@mozilla.com> | 2014-12-18 20:09:57 -0800 |
|---|---|---|
| committer | Keegan McAllister <kmcallister@mozilla.com> | 2015-01-05 12:00:57 -0800 |
| commit | fc584793237c388e9dca76ef406d1af34e453fe2 (patch) | |
| tree | 9b8116de6b62341df1fee3edb56368b35d984fd3 /src/libcore | |
| parent | 73806ddd0fd91066d7b903a00a080cbadcc04311 (diff) | |
| download | rust-fc584793237c388e9dca76ef406d1af34e453fe2.tar.gz rust-fc584793237c388e9dca76ef406d1af34e453fe2.zip | |
Stop using macro_escape as an inner attribute
In preparation for the rename.
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/lib.rs | 15 | ||||
| -rw-r--r-- | src/libcore/macros.rs | 2 | ||||
| -rw-r--r-- | src/libcore/num/float_macros.rs | 1 | ||||
| -rw-r--r-- | src/libcore/num/int_macros.rs | 1 | ||||
| -rw-r--r-- | src/libcore/num/uint_macros.rs | 1 |
5 files changed, 12 insertions, 8 deletions
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs index 0cda2e4a9c6..588421dfa10 100644 --- a/src/libcore/lib.rs +++ b/src/libcore/lib.rs @@ -62,11 +62,20 @@ #![feature(default_type_params, unboxed_closures, associated_types)] #![deny(missing_docs)] +#[macro_escape] mod macros; -#[path = "num/float_macros.rs"] mod float_macros; -#[path = "num/int_macros.rs"] mod int_macros; -#[path = "num/uint_macros.rs"] mod uint_macros; +#[path = "num/float_macros.rs"] +#[macro_escape] +mod float_macros; + +#[path = "num/int_macros.rs"] +#[macro_escape] +mod int_macros; + +#[path = "num/uint_macros.rs"] +#[macro_escape] +mod uint_macros; #[path = "num/int.rs"] pub mod int; #[path = "num/i8.rs"] pub mod i8; diff --git a/src/libcore/macros.rs b/src/libcore/macros.rs index 3b21a68a292..a579f9db416 100644 --- a/src/libcore/macros.rs +++ b/src/libcore/macros.rs @@ -8,8 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![macro_escape] - /// Entry point of task panic, for details, see std::macros #[macro_export] macro_rules! panic { diff --git a/src/libcore/num/float_macros.rs b/src/libcore/num/float_macros.rs index 97de61d7e27..20300d29fa0 100644 --- a/src/libcore/num/float_macros.rs +++ b/src/libcore/num/float_macros.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![macro_escape] #![doc(hidden)] macro_rules! assert_approx_eq { diff --git a/src/libcore/num/int_macros.rs b/src/libcore/num/int_macros.rs index 522eab9180c..61cd8cbf7c1 100644 --- a/src/libcore/num/int_macros.rs +++ b/src/libcore/num/int_macros.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![macro_escape] #![doc(hidden)] macro_rules! int_module { ($T:ty, $bits:expr) => ( diff --git a/src/libcore/num/uint_macros.rs b/src/libcore/num/uint_macros.rs index 82eca0d4659..535765840a0 100644 --- a/src/libcore/num/uint_macros.rs +++ b/src/libcore/num/uint_macros.rs @@ -8,7 +8,6 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -#![macro_escape] #![doc(hidden)] macro_rules! uint_module { ($T:ty, $T_SIGNED:ty, $bits:expr) => ( |