1
Fork 0

Stop using macro_escape as an inner attribute

In preparation for the rename.
This commit is contained in:
Keegan McAllister 2014-12-18 20:09:57 -08:00
parent 73806ddd0f
commit fc58479323
32 changed files with 55 additions and 47 deletions

View file

@ -54,6 +54,7 @@ pub use vec_map::VecMap;
// Needed for the vec! macro // Needed for the vec! macro
pub use alloc::boxed; pub use alloc::boxed;
#[macro_escape]
mod macros; mod macros;
pub mod binary_heap; pub mod binary_heap;

View file

@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![macro_escape]
/// Creates a `std::vec::Vec` containing the arguments. /// Creates a `std::vec::Vec` containing the arguments.
// NOTE: remove after the next snapshot // NOTE: remove after the next snapshot
#[cfg(stage0)] #[cfg(stage0)]

View file

@ -62,11 +62,20 @@
#![feature(default_type_params, unboxed_closures, associated_types)] #![feature(default_type_params, unboxed_closures, associated_types)]
#![deny(missing_docs)] #![deny(missing_docs)]
#[macro_escape]
mod macros; mod macros;
#[path = "num/float_macros.rs"] mod float_macros; #[path = "num/float_macros.rs"]
#[path = "num/int_macros.rs"] mod int_macros; #[macro_escape]
#[path = "num/uint_macros.rs"] mod uint_macros; 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/int.rs"] pub mod int;
#[path = "num/i8.rs"] pub mod i8; #[path = "num/i8.rs"] pub mod i8;

View file

@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![macro_escape]
/// Entry point of task panic, for details, see std::macros /// Entry point of task panic, for details, see std::macros
#[macro_export] #[macro_export]
macro_rules! panic { macro_rules! panic {

View file

@ -8,7 +8,6 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![macro_escape]
#![doc(hidden)] #![doc(hidden)]
macro_rules! assert_approx_eq { macro_rules! assert_approx_eq {

View file

@ -8,7 +8,6 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![macro_escape]
#![doc(hidden)] #![doc(hidden)]
macro_rules! int_module { ($T:ty, $bits:expr) => ( macro_rules! int_module { ($T:ty, $bits:expr) => (

View file

@ -8,7 +8,6 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![macro_escape]
#![doc(hidden)] #![doc(hidden)]
macro_rules! uint_module { ($T:ty, $T_SIGNED:ty, $bits:expr) => ( macro_rules! uint_module { ($T:ty, $T_SIGNED:ty, $bits:expr) => (

View file

@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![macro_escape]
macro_rules! int_module (($T:ty, $T_i:ident) => ( macro_rules! int_module (($T:ty, $T_i:ident) => (
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {

View file

@ -14,13 +14,18 @@ use core::num::{NumCast, cast};
use core::ops::{Add, Sub, Mul, Div, Rem}; use core::ops::{Add, Sub, Mul, Div, Rem};
use core::kinds::Copy; use core::kinds::Copy;
#[macro_escape]
mod int_macros; mod int_macros;
mod i8; mod i8;
mod i16; mod i16;
mod i32; mod i32;
mod i64; mod i64;
mod int; mod int;
#[macro_escape]
mod uint_macros; mod uint_macros;
mod u8; mod u8;
mod u16; mod u16;
mod u32; mod u32;

View file

@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![macro_escape]
macro_rules! uint_module (($T:ty, $T_i:ident) => ( macro_rules! uint_module (($T:ty, $T_i:ident) => (
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {

View file

@ -183,7 +183,9 @@ use regex::Regex;
use directive::LOG_LEVEL_NAMES; use directive::LOG_LEVEL_NAMES;
#[macro_escape]
pub mod macros; pub mod macros;
mod directive; mod directive;
/// Maximum logging level of a module that can be specified. Common logging /// Maximum logging level of a module that can be specified. Common logging

View file

@ -10,8 +10,6 @@
//! Logging macros //! Logging macros
#![macro_escape]
/// The standard logging macro /// The standard logging macro
/// ///
/// This macro will generically log over a provided level (of type u32) with a /// This macro will generically log over a provided level (of type u32) with a

View file

@ -28,8 +28,6 @@
//! example) requires more effort. See `emit_lint` and `GatherNodeLevels` //! example) requires more effort. See `emit_lint` and `GatherNodeLevels`
//! in `context.rs`. //! in `context.rs`.
#![macro_escape]
pub use self::Level::*; pub use self::Level::*;
pub use self::LintSource::*; pub use self::LintSource::*;

View file

@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![macro_escape]
macro_rules! unpack_datum { macro_rules! unpack_datum {
($bcx: ident, $inp: expr) => ( ($bcx: ident, $inp: expr) => (
{ {

View file

@ -16,8 +16,10 @@ pub use self::base::trans_crate;
pub use self::context::CrateContext; pub use self::context::CrateContext;
pub use self::common::gensym_name; pub use self::common::gensym_name;
mod doc; #[macro_escape]
mod macros; mod macros;
mod doc;
mod inline; mod inline;
mod monomorphize; mod monomorphize;
mod controlflow; mod controlflow;

View file

@ -49,11 +49,12 @@ use rustc::session::search_paths::SearchPaths;
// reexported from `clean` so it can be easily updated with the mod itself // reexported from `clean` so it can be easily updated with the mod itself
pub use clean::SCHEMA_VERSION; pub use clean::SCHEMA_VERSION;
#[macro_escape]
pub mod externalfiles;
pub mod clean; pub mod clean;
pub mod core; pub mod core;
pub mod doctree; pub mod doctree;
#[macro_escape]
pub mod externalfiles;
pub mod fold; pub mod fold;
pub mod html { pub mod html {
pub mod highlight; pub mod highlight;

View file

@ -9,7 +9,6 @@
// except according to those terms. // except according to those terms.
#![experimental] #![experimental]
#![macro_escape]
//! A typesafe bitmask flag generator. //! A typesafe bitmask flag generator.

View file

@ -282,10 +282,12 @@ pub mod net;
pub mod pipe; pub mod pipe;
pub mod process; pub mod process;
pub mod stdio; pub mod stdio;
pub mod test;
pub mod timer; pub mod timer;
pub mod util; pub mod util;
#[macro_escape]
pub mod test;
/// The default buffer size for various I/O operations /// The default buffer size for various I/O operations
// libuv recommends 64k buffers to maximize throughput // libuv recommends 64k buffers to maximize throughput
// https://groups.google.com/forum/#!topic/libuv/oQO1HJAIDdA // https://groups.google.com/forum/#!topic/libuv/oQO1HJAIDdA

View file

@ -10,8 +10,6 @@
//! Various utility functions useful for writing I/O tests //! Various utility functions useful for writing I/O tests
#![macro_escape]
use prelude::v1::*; use prelude::v1::*;
use libc; use libc;

View file

@ -172,8 +172,15 @@ pub use unicode::char;
/* Exported macros */ /* Exported macros */
#[cfg(stage0)] pub mod macros_stage0; #[cfg(stage0)]
#[cfg(not(stage0))] pub mod macros; #[macro_escape]
pub mod macros_stage0;
#[cfg(not(stage0))]
#[macro_escape]
pub mod macros;
#[macro_escape]
pub mod bitflags; pub mod bitflags;
mod rtdeps; mod rtdeps;
@ -185,9 +192,17 @@ pub mod prelude;
/* Primitive types */ /* Primitive types */
#[path = "num/float_macros.rs"] mod float_macros; #[path = "num/float_macros.rs"]
#[path = "num/int_macros.rs"] mod int_macros; #[macro_escape]
#[path = "num/uint_macros.rs"] mod uint_macros; 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/int.rs"] pub mod int;
#[path = "num/i8.rs"] pub mod i8; #[path = "num/i8.rs"] pub mod i8;
@ -214,7 +229,9 @@ pub mod num;
/* Runtime and platform support */ /* Runtime and platform support */
#[macro_escape]
pub mod thread_local; pub mod thread_local;
pub mod c_str; pub mod c_str;
pub mod c_vec; pub mod c_vec;
pub mod dynamic_lib; pub mod dynamic_lib;

View file

@ -15,7 +15,6 @@
//! library. //! library.
#![experimental] #![experimental]
#![macro_escape]
/// The entry point for panic of Rust tasks. /// The entry point for panic of Rust tasks.
/// ///

View file

@ -15,7 +15,6 @@
//! library. //! library.
#![experimental] #![experimental]
#![macro_escape]
/// The entry point for panic of Rust tasks. /// The entry point for panic of Rust tasks.
/// ///

View file

@ -9,7 +9,6 @@
// except according to those terms. // except according to those terms.
#![experimental] #![experimental]
#![macro_escape]
#![doc(hidden)] #![doc(hidden)]
macro_rules! assert_approx_eq { macro_rules! assert_approx_eq {

View file

@ -9,7 +9,6 @@
// except according to those terms. // except according to those terms.
#![experimental] #![experimental]
#![macro_escape]
#![doc(hidden)] #![doc(hidden)]
macro_rules! int_module { ($T:ty) => ( macro_rules! int_module { ($T:ty) => (

View file

@ -9,7 +9,6 @@
// except according to those terms. // except according to those terms.
#![experimental] #![experimental]
#![macro_escape]
#![doc(hidden)] #![doc(hidden)]
#![allow(unsigned_negation)] #![allow(unsigned_negation)]

View file

@ -13,8 +13,6 @@
//! These macros call functions which are only accessible in the `rt` module, so //! These macros call functions which are only accessible in the `rt` module, so
//! they aren't defined anywhere outside of the `rt` module. //! they aren't defined anywhere outside of the `rt` module.
#![macro_escape]
macro_rules! rterrln { macro_rules! rterrln {
($fmt:expr $($arg:tt)*) => ( { ($fmt:expr $($arg:tt)*) => ( {
::rt::util::dumb_print(format_args!(concat!($fmt, "\n") $($arg)*)) ::rt::util::dumb_print(format_args!(concat!($fmt, "\n") $($arg)*))

View file

@ -34,13 +34,13 @@
//! will want to make use of some form of **interior mutability** through the //! will want to make use of some form of **interior mutability** through the
//! `Cell` or `RefCell` types. //! `Cell` or `RefCell` types.
#![macro_escape]
#![stable] #![stable]
use prelude::v1::*; use prelude::v1::*;
use cell::UnsafeCell; use cell::UnsafeCell;
#[macro_escape]
pub mod scoped; pub mod scoped;
// Sure wish we had macro hygiene, no? // Sure wish we had macro hygiene, no?

View file

@ -38,7 +38,6 @@
//! }); //! });
//! ``` //! ```
#![macro_escape]
#![unstable = "scoped TLS has yet to have wide enough use to fully consider \ #![unstable = "scoped TLS has yet to have wide enough use to fully consider \
stabilizing its interface"] stabilizing its interface"]

View file

@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![macro_escape]
#[macro_export] #[macro_export]
macro_rules! register_diagnostic { macro_rules! register_diagnostic {
($code:tt, $description:tt) => (__register_diagnostic! { $code, $description }); ($code:tt, $description:tt) => (__register_diagnostic! { $code, $description });

View file

@ -24,8 +24,10 @@ use std::num::Int;
use std::str; use std::str;
use std::iter; use std::iter;
pub mod lexer; #[macro_escape]
pub mod parser; pub mod parser;
pub mod lexer;
pub mod token; pub mod token;
pub mod attr; pub mod attr;

View file

@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed // option. This file may not be copied, modified, or distributed
// except according to those terms. // except according to those terms.
#![macro_escape]
pub use self::PathParsingMode::*; pub use self::PathParsingMode::*;
use self::ItemOrViewItem::*; use self::ItemOrViewItem::*;

View file

@ -11,7 +11,6 @@
#![crate_type = "lib"] #![crate_type = "lib"]
#![feature(macro_rules)] #![feature(macro_rules)]
#![macro_escape]
#[deprecated] #[deprecated]
pub fn deprecated() {} pub fn deprecated() {}