Skip to content

Commit

Permalink
Auto merge of #13831 - servo:rm-util-ipc, r=Wafflespeanut
Browse files Browse the repository at this point in the history
Remove util::ipc module (fixes #12312)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13831)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Oct 20, 2016
2 parents 2e9aaa4 + a1c6911 commit 7a8734c
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 185 deletions.
1 change: 0 additions & 1 deletion components/servo/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions components/util/Cargo.toml
Expand Up @@ -11,7 +11,7 @@ path = "lib.rs"

[features]
# servo as opposed to geckolib
servo = ["serde", "serde_derive", "ipc-channel", "app_units/plugins",
servo = ["serde", "serde_derive", "app_units/plugins",
"euclid/unstable", "url/heap_size", "url/serde", "plugins"]

[dependencies]
Expand All @@ -20,7 +20,6 @@ bitflags = "0.7"
euclid = "0.10.1"
getopts = "0.2.11"
heapsize = "0.3.0"
ipc-channel = {version = "0.5", optional = true}
lazy_static = "0.2"
log = "0.3.5"
num_cpus = "0.2.2"
Expand Down
179 changes: 0 additions & 179 deletions components/util/ipc.rs

This file was deleted.

2 changes: 0 additions & 2 deletions components/util/lib.rs
Expand Up @@ -18,7 +18,6 @@ extern crate core;
#[macro_use] extern crate euclid;
extern crate getopts;
#[macro_use] extern crate heapsize;
#[cfg(feature = "servo")] extern crate ipc_channel;
#[allow(unused_extern_crates)] #[macro_use] extern crate lazy_static;
#[macro_use] extern crate log;
extern crate num_cpus;
Expand All @@ -31,7 +30,6 @@ extern crate xdg;

pub mod basedir;
pub mod geometry;
#[cfg(feature = "servo")] #[allow(unsafe_code)] pub mod ipc;
#[allow(unsafe_code)] pub mod opts;
pub mod prefs;
#[cfg(feature = "servo")] pub mod remutex;
Expand Down
1 change: 0 additions & 1 deletion ports/cef/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 7a8734c

Please sign in to comment.