diff options
| -rw-r--r-- | components/servo/Cargo.lock | 4 | ||||
| -rw-r--r-- | components/util/Cargo.toml | 22 | ||||
| -rw-r--r-- | components/util/lib.rs | 8 | ||||
| -rw-r--r-- | ports/cef/Cargo.lock | 4 | ||||
| -rw-r--r-- | ports/gonk/Cargo.lock | 4 |
5 files changed, 1 insertions, 41 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index f78d15b3b1b..49672e9246b 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -2034,19 +2034,15 @@ name = "util" version = "0.0.1" dependencies = [ "app_units 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.4.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "html5ever 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.0 (git+https://github.com/servo/ipc-channel)", "js 0.1.1 (git+https://github.com/servo/rust-mozjs)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "layers 0.2.1 (git+https://github.com/servo/rust-layers)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/components/util/Cargo.toml b/components/util/Cargo.toml index 6d5ef0714a8..10db2f6ce25 100644 --- a/components/util/Cargo.toml +++ b/components/util/Cargo.toml @@ -7,14 +7,6 @@ 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 @@ -22,25 +14,15 @@ doctest = false # 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" @@ -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" diff --git a/components/util/lib.rs b/components/util/lib.rs index 34e8883d02b..42362b74c73 100644 --- a/components/util/lib.rs +++ b/components/util/lib.rs @@ -21,8 +21,6 @@ extern crate alloc; extern crate app_units; -#[cfg(feature = "non-geckolib")] -extern crate azure; #[macro_use] extern crate bitflags; #[macro_use] @@ -30,15 +28,9 @@ 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; diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 796fcb6d639..470fc09f425 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1931,19 +1931,15 @@ name = "util" version = "0.0.1" dependencies = [ "app_units 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.4.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "html5ever 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.0 (git+https://github.com/servo/ipc-channel)", "js 0.1.1 (git+https://github.com/servo/rust-mozjs)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "layers 0.2.1 (git+https://github.com/servo/rust-layers)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index 09893b87e30..79c1abf3b16 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -1911,19 +1911,15 @@ name = "util" version = "0.0.1" dependencies = [ "app_units 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "azure 0.4.0 (git+https://github.com/servo/rust-azure)", "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "cssparser 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", "euclid 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", "heapsize_plugin 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "html5ever 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hyper 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "ipc-channel 0.2.0 (git+https://github.com/servo/ipc-channel)", "js 0.1.1 (git+https://github.com/servo/rust-mozjs)", "kernel32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "layers 0.2.1 (git+https://github.com/servo/rust-layers)", "lazy_static 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", |