diff options
Diffstat (limited to 'src/components/gfx')
| -rw-r--r-- | src/components/gfx/gfx.rs | 7 | ||||
| -rw-r--r-- | src/components/gfx/macros.rs | 24 |
2 files changed, 3 insertions, 28 deletions
diff --git a/src/components/gfx/gfx.rs b/src/components/gfx/gfx.rs index dffe06f5f1e..d2a50d8f46c 100644 --- a/src/components/gfx/gfx.rs +++ b/src/components/gfx/gfx.rs @@ -5,7 +5,7 @@ #[crate_id = "github.com/mozilla/servo#gfx:0.1"]; #[crate_type = "lib"]; -#[feature(globs, managed_boxes, macro_rules)]; +#[feature(globs, managed_boxes, macro_rules, phase)]; extern crate azure; extern crate collections; @@ -14,6 +14,8 @@ extern crate geom; extern crate layers; extern crate stb_image; extern crate png; +#[phase(syntax)] +extern crate servo_macros = "macros"; extern crate servo_net = "net"; extern crate servo_util = "util"; extern crate servo_msg = "msg"; @@ -39,9 +41,6 @@ pub use gfx_font_list = font_list; pub use servo_gfx_font = font; pub use servo_gfx_font_list = font_list; -// Macros -mod macros; - // Private rendering modules mod render_context; diff --git a/src/components/gfx/macros.rs b/src/components/gfx/macros.rs deleted file mode 100644 index 2edf8111732..00000000000 --- a/src/components/gfx/macros.rs +++ /dev/null @@ -1,24 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#[macro_escape]; - -macro_rules! bitfield( - ($bitfieldname:ident, $getter:ident, $setter:ident, $value:expr) => ( - impl $bitfieldname { - #[inline] - pub fn $getter(self) -> bool { - let $bitfieldname(this) = self; - (this & $value) != 0 - } - - #[inline] - pub fn $setter(&mut self, value: bool) { - let $bitfieldname(this) = *self; - *self = $bitfieldname((this & !$value) | (if value { $value } else { 0 })) - } - } - ) -) - |