Auto merge of #6159 - SimonSapin:no_mod_path, r=Manishearth

https://github.com/rust-lang/rust/pull/20179 makes its use case much weaker.

r? @Manishearth

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6159)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-22 03:13:13 -05:00
commit e04d9c32a9
6 changed files with 4 additions and 23 deletions

View file

@ -745,11 +745,6 @@ dependencies = [
"libc 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[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"
@ -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)",

View file

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

View file

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

View file

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