diff options
| -rw-r--r-- | components/servo/Cargo.lock | 6 | ||||
| -rw-r--r-- | components/style/Cargo.toml | 1 | ||||
| -rw-r--r-- | components/style/lib.rs | 6 | ||||
| -rw-r--r-- | components/style/properties.mako.rs | 2 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 6 | ||||
| -rw-r--r-- | ports/gonk/Cargo.lock | 6 |
6 files changed, 4 insertions, 23 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index bbf2a3e0739..26b0fe8f2c5 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -746,11 +746,6 @@ dependencies = [ ] [[package]] -name = "mod_path" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "mozjs_sys" version = "0.0.0" source = "git+https://github.com/servo/mozjs#19edb950930f03f0ad305ffbd9548b92fdb0a250" @@ -1152,7 +1147,6 @@ dependencies = [ "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "lazy_static 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "mod_path 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/style/Cargo.toml b/components/style/Cargo.toml index d29f89d4863..28aa005951d 100644 --- a/components/style/Cargo.toml +++ b/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/components/style/lib.rs b/components/style/lib.rs index 59a936dd737..9469d021196 100644 --- a/components/style/lib.rs +++ b/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/components/style/properties.mako.rs b/components/style/properties.mako.rs index 7ddeb3795ff..518ce6dd542 100644 --- a/components/style/properties.mako.rs +++ b/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/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index cecb4d20dd0..13a1492c42f 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -748,11 +748,6 @@ dependencies = [ ] [[package]] -name = "mod_path" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "mozjs_sys" version = "0.0.0" source = "git+https://github.com/servo/mozjs#19edb950930f03f0ad305ffbd9548b92fdb0a250" @@ -1159,7 +1154,6 @@ dependencies = [ "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "lazy_static 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "mod_path 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 168f839f5fd..85edae988ce 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -649,11 +649,6 @@ dependencies = [ ] [[package]] -name = "mod_path" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] name = "mozjs_sys" version = "0.0.0" source = "git+https://github.com/servo/mozjs#19edb950930f03f0ad305ffbd9548b92fdb0a250" @@ -1032,7 +1027,6 @@ dependencies = [ "geom 0.1.0 (git+https://github.com/servo/rust-geom)", "lazy_static 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "matches 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "mod_path 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.24 (registry+https://github.com/rust-lang/crates.io-index)", "plugins 0.0.1", "rustc-serialize 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)", |