servo: Merge #6159 - Remove usage of the mod_path compiler plugin (from 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

UltraBlame original commit: 81933413281cee300e35174beae0d9bf87083c71

Author: marco-c

servo/components/servo/Cargo.lock

@@ -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"

servo/components/style/Cargo.toml

@@ -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;
 
 
-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;

servo/components/style/lib.rs

@@ -4,8 +4,6 @@
 
 
 
-#![macro_use]
-
 use std::ascii::AsciiExt;
 use std::borrow::ToOwned;
 use std::default::Default;