Skip to content

Commit

Permalink
Auto merge of #9554 - Ms2ger:util-deps, r=nox
Browse files Browse the repository at this point in the history
Remove some unused dependencies from the util crate.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9554)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Feb 5, 2016
2 parents b468a6c + 7e76837 commit 289232e
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 41 deletions.
4 changes: 0 additions & 4 deletions components/servo/Cargo.lock

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

22 changes: 1 addition & 21 deletions components/util/Cargo.toml
Expand Up @@ -7,40 +7,22 @@ authors = ["The Servo Project Developers"]
name = "util"
path = "lib.rs"

# Disable doctests, because of linking issues with rustdoc. rustdoc compiles
# documentation tests with prefer-dynamic. This causes issues because rustc
# looks for -lazure, which does not exist (rust-azure is a dependency of
# rust-layers). This crate only has one documentation example anyway and it's
# imported from the rust-lang codebase.
# See https://github.com/rust-lang/rust/issues/21246
doctest = false

[features]

# This feature allows us to avoid depending on various things we don't need for
# GeckoLib builds. Conceptually, it would make more sense to have a "geckolib"
# feature, but Cargo is generally set up for features to add dependencies, not
# remove them. So we do it this way, and request that all non-GeckoLib builds
# set this feature.
non-geckolib = ["azure", "js", "layers", "html5ever", "hyper"]
non-geckolib = ["js"]

[dependencies.plugins]
path = "../plugins"

[dependencies.azure]
git = "https://github.com/servo/rust-azure"
features = ["plugins"]
optional = true

[dependencies.js]
git = "https://github.com/servo/rust-mozjs"
optional = true

[dependencies.layers]
git = "https://github.com/servo/rust-layers"
features = ["plugins"]
optional = true

[dependencies.ipc-channel]
git = "https://github.com/servo/ipc-channel"

Expand All @@ -50,10 +32,8 @@ bitflags = "0.3"
cssparser = {version = "0.5.2", features = ["heap_size", "serde-serialization"]}
euclid = {version = "0.6.1", features = ["unstable", "plugins"]}
getopts = "0.2.11"
html5ever = {version = "0.4.2", features = ["heap_size", "unstable"], optional = true}
heapsize = "0.2.5"
heapsize_plugin = "0.1.2"
hyper = { version = "0.7", optional = true }
lazy_static = "0.1"
libc = "0.2"
log = "0.3"
Expand Down
8 changes: 0 additions & 8 deletions components/util/lib.rs
Expand Up @@ -21,24 +21,16 @@

extern crate alloc;
extern crate app_units;
#[cfg(feature = "non-geckolib")]
extern crate azure;
#[macro_use]
extern crate bitflags;
#[macro_use]
extern crate cssparser;
extern crate euclid;
extern crate getopts;
extern crate heapsize;
#[cfg(feature = "non-geckolib")]
extern crate html5ever;
#[cfg(feature = "non-geckolib")]
extern crate hyper;
extern crate ipc_channel;
#[cfg(feature = "non-geckolib")]
extern crate js;
#[cfg(feature = "non-geckolib")]
extern crate layers;
#[macro_use]
extern crate lazy_static;
extern crate libc;
Expand Down
4 changes: 0 additions & 4 deletions ports/cef/Cargo.lock

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

4 changes: 0 additions & 4 deletions ports/gonk/Cargo.lock

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

0 comments on commit 289232e

Please sign in to comment.