servo: Merge #6159 - Remove usage of the mod_path compiler plugin (fr…

…om SimonSapin:no_mod_path); r=Manishearth rust-lang/rust#20179 makes its use case much weaker. r? @Manishearth Source-Repo: https://github.com/servo/servo Source-Revision: e04d9c32a98ff4673f413ed17f66e7466e2ff974
jrmuizel · May 22, 2015 · 469c482 · 469c482
1 parent f0b127c
commit 469c482
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 23 deletions.
diff --git a/servo/components/servo/Cargo.lock b/servo/components/servo/Cargo.lock
diff --git a/servo/components/style/Cargo.toml b/servo/components/style/Cargo.toml
@@ -32,7 +32,6 @@ encoding = "0.2"
 rustc-serialize = "0.3"
 matches = "0.1"
 url = "0.2.16"
-mod_path = "0.1"
 bitflags = "*"
 cssparser = "0.3.1"
 num = "0.1.24"

diff --git a/servo/components/style/lib.rs b/servo/components/style/lib.rs
@@ -11,7 +11,6 @@
 #![feature(rustc_private)]
 
 #![plugin(string_cache_plugin)]
-#![plugin(mod_path)]
 
 #[macro_use] extern crate log;
 #[macro_use] extern crate bitflags;
@@ -44,7 +43,10 @@ pub mod selector_matching;
 #[macro_use] pub mod values;
 
 // Generated from the properties.mako.rs template by build.rs
-mod_path! properties (concat!(env!("OUT_DIR"), "/properties.rs"));
+#[macro_use]
+pub mod properties {
+    include!(concat!(env!("OUT_DIR"), "/properties.rs"));
+}
 
 pub mod node;
 pub mod media_queries;

diff --git a/servo/components/style/properties.mako.rs b/servo/components/style/properties.mako.rs
@@ -4,8 +4,6 @@
 
 // This file is a Mako template: http://www.makotemplates.org/
 
-#![macro_use]
-
 use std::ascii::AsciiExt;
 use std::borrow::ToOwned;
 use std::default::Default;

diff --git a/servo/ports/cef/Cargo.lock b/servo/ports/cef/Cargo.lock
diff --git a/servo/ports/gonk/Cargo.lock b/servo/ports/gonk/Cargo.lock