Remove references to unused crates.

The cleanup is based on info from using "-W unused-extern-crates".

components/canvas/Cargo.toml

@@ -12,10 +12,6 @@ path = "lib.rs"
 git = "https://github.com/servo/rust-azure"
 features = ["plugins"]
 
-[dependencies.layers]
-git = "https://github.com/servo/rust-layers"
-features = ["plugins"]
-
 [dependencies.canvas_traits]
 path = "../canvas_traits"
 

components/canvas/lib.rs

@@ -14,7 +14,6 @@ extern crate euclid;
 extern crate gfx_traits;
 extern crate gleam;
 extern crate ipc_channel;
-extern crate layers;
 #[macro_use]
 extern crate log;
 extern crate num;

components/canvas_traits/Cargo.toml

@@ -25,9 +25,6 @@ features = [ "nightly" ]
 [dependencies.plugins]
 path = "../plugins"
 
-[dependencies.util]
-path = "../util"
-
 [dependencies.webrender_traits]
 git = "https://github.com/servo/webrender_traits"
 
@@ -36,6 +33,5 @@ cssparser = {version = "0.5.4", features = ["heap_size", "serde-serialization"]}
 euclid = {version = "0.6.4", features = ["plugins"]}
 heapsize = "0.3.0"
 heapsize_plugin = "0.1.2"
-offscreen_gl_context = "0.1.2"
 serde_macros = "0.7"
 

components/canvas_traits/lib.rs

@@ -17,9 +17,7 @@ extern crate euclid;
 extern crate gfx_traits;
 extern crate heapsize;
 extern crate ipc_channel;
-extern crate offscreen_gl_context;
 extern crate serde;
-extern crate util;
 extern crate webrender_traits;
 
 use azure::azure::{AzColor, AzFloat};

components/devtools/Cargo.toml

@@ -25,7 +25,6 @@ git = "https://github.com/servo/ipc-channel"
 
 [dependencies]
 hyper = { version = "0.8", features = [ "serde-serialization" ] }
-log = "0.3.5"
 serde = "0.7"
 serde_json = "0.7"
 serde_macros = "0.7"

components/devtools/lib.rs

@@ -23,8 +23,6 @@
 extern crate devtools_traits;
 extern crate hyper;
 extern crate ipc_channel;
-#[macro_use]
-extern crate log;
 extern crate msg;
 extern crate serde;
 extern crate serde_json;

components/devtools_traits/Cargo.toml

@@ -11,9 +11,6 @@ path = "lib.rs"
 [dependencies.msg]
 path = "../msg"
 
-[dependencies.util]
-path = "../util"
-
 [dependencies.ipc-channel]
 git = "https://github.com/servo/ipc-channel"
 

components/devtools_traits/lib.rs

@@ -25,7 +25,6 @@ extern crate msg;
 extern crate serde;
 extern crate time;
 extern crate url;
-extern crate util;
 
 use hyper::header::Headers;
 use hyper::http::RawStatus;

components/gfx_traits/Cargo.toml

@@ -22,9 +22,6 @@ path = "../msg"
 [dependencies.plugins]
 path = "../plugins"
 
-[dependencies.util]
-path = "../util"
-
 [dependencies]
 euclid = {version = "0.6.5", features = ["plugins"]}
 heapsize = "0.3.0"

components/gfx_traits/lib.rs

@@ -16,7 +16,6 @@ extern crate heapsize;
 extern crate layers;
 extern crate msg;
 extern crate serde;
-extern crate util;
 
 pub mod color;
 mod paint_listener;

components/layout/Cargo.toml

@@ -72,7 +72,6 @@ libc = "0.2"
 log = "0.3.5"
 rustc-serialize = "0.3"
 selectors = {version = "0.5.1", features = ["heap_size"]}
-serde = "0.7"
 serde_json = "0.7"
 serde_macros = "0.7"
 smallvec = "0.1"

components/layout/lib.rs

@@ -50,7 +50,6 @@ extern crate rustc_serialize;
 extern crate script;
 extern crate script_traits;
 extern crate selectors;
-extern crate serde;
 extern crate serde_json;
 extern crate smallvec;
 #[macro_use(atom, ns)] extern crate string_cache;

components/script/dom/htmliframeelement.rs

@@ -13,7 +13,7 @@ use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding;
 use dom::bindings::codegen::Bindings::HTMLIFrameElementBinding::HTMLIFrameElementMethods;
 use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
 use dom::bindings::conversions::{ToJSValConvertible};
-use dom::bindings::error::{Error, ErrorResult, Fallible};
+use dom::bindings::error::{Error, ErrorResult};
 use dom::bindings::global::GlobalRef;
 use dom::bindings::inheritance::Castable;
 use dom::bindings::js::{Root, LayoutJS};

components/script/dom/htmllinkelement.rs

@@ -8,7 +8,6 @@ use dom::attr::{Attr, AttrValue};
 use dom::bindings::cell::DOMRefCell;
 use dom::bindings::codegen::Bindings::HTMLLinkElementBinding;
 use dom::bindings::codegen::Bindings::HTMLLinkElementBinding::HTMLLinkElementMethods;
-use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods;
 use dom::bindings::inheritance::Castable;
 use dom::bindings::js::{JS, MutNullableHeap, Root};
 use dom::bindings::js::{RootedReference};

components/servo/Cargo.lock

@@ -30,7 +30,6 @@ dependencies = [
  "net_tests 0.0.1",
  "net_traits 0.0.1",
  "net_traits_tests 0.0.1",
- "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "plugin_compiletest 0.0.1",
  "profile 0.0.1",
  "profile_traits 0.0.1",
@@ -167,7 +166,6 @@ dependencies = [
  "gfx_traits 0.0.1",
  "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
- "layers 0.2.4 (git+https://github.com/servo/rust-layers)",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -187,11 +185,9 @@ dependencies = [
  "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
- "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "plugins 0.0.1",
  "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "util 0.0.1",
  "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
@@ -408,7 +404,6 @@ dependencies = [
  "devtools_traits 0.0.1",
  "hyper 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
- "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "plugins 0.0.1",
  "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -433,7 +428,6 @@ dependencies = [
  "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "util 0.0.1",
 ]
 
 [[package]]
@@ -736,7 +730,6 @@ dependencies = [
  "plugins 0.0.1",
  "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "util 0.0.1",
 ]
 
 [[package]]
@@ -1062,7 +1055,6 @@ dependencies = [
  "script 0.0.1",
  "script_traits 0.0.1",
  "selectors 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",

components/servo/Cargo.toml

@@ -127,7 +127,7 @@ optional = true
 version = "0.1.3"
 optional = true
 
-[dependencies.log]
+[target.arm-linux-androideabi.dependencies.log]
 version = "0.3"
 features = ["release_max_level_info"]
 
@@ -168,5 +168,4 @@ bitflags = "0.3"
 env_logger = "0.3"
 euclid = {version = "0.6.4", features = ["plugins"]}
 libc = "0.2"
-offscreen_gl_context = "0.1.2"
 url = {version = "0.5.7", features = ["heap_size", "serde_serialization", "query_encoding"]}

components/servo/main.rs

@@ -21,14 +21,13 @@
 #[macro_use]
 extern crate android_glue;
 extern crate env_logger;
-extern crate gleam;
 // The window backed by glutin
 extern crate glutin_app as app;
 #[cfg(target_os = "android")]
 extern crate libc;
+#[cfg(target_os = "android")]
 #[macro_use]
 extern crate log;
-extern crate offscreen_gl_context;
 // The Servo engine
 extern crate servo;
 

components/util/resource_files.rs

@@ -2,6 +2,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#[cfg(not(target_os = "android"))]
 use std::env;
 use std::fs::File;
 use std::io::{self, Read};

components/webdriver_server/lib.rs

@@ -14,8 +14,6 @@ extern crate compositing;
 extern crate hyper;
 extern crate image;
 extern crate ipc_channel;
-#[macro_use]
-extern crate log;
 extern crate msg;
 extern crate regex;
 extern crate rustc_serialize;

ports/cef/Cargo.lock

@@ -152,7 +152,6 @@ dependencies = [
  "gfx_traits 0.0.1",
  "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
- "layers 0.2.4 (git+https://github.com/servo/rust-layers)",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -172,11 +171,9 @@ dependencies = [
  "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
- "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "plugins 0.0.1",
  "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "util 0.0.1",
  "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
@@ -378,7 +375,6 @@ dependencies = [
  "devtools_traits 0.0.1",
  "hyper 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
- "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "plugins 0.0.1",
  "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -403,7 +399,6 @@ dependencies = [
  "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "util 0.0.1",
 ]
 
 [[package]]
@@ -656,7 +651,6 @@ dependencies = [
  "plugins 0.0.1",
  "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "util 0.0.1",
 ]
 
 [[package]]
@@ -982,7 +976,6 @@ dependencies = [
  "script 0.0.1",
  "script_traits 0.0.1",
  "selectors 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1724,7 +1717,6 @@ dependencies = [
  "msg 0.0.1",
  "net 0.0.1",
  "net_traits 0.0.1",
- "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "profile 0.0.1",
  "profile_traits 0.0.1",
  "script 0.0.1",

ports/glutin/window.rs

@@ -22,13 +22,16 @@ use msg::constellation_msg::{self, Key};
 use net_traits::net_error_list::NetError;
 use script_traits::{TouchEventType, TouchpadPressurePhase};
 use std::cell::{Cell, RefCell};
+#[cfg(not(target_os = "android"))]
 use std::os::raw::c_void;
 use std::rc::Rc;
 use std::sync::mpsc::{channel, Sender};
 use style_traits::cursor::Cursor;
 use url::Url;
 use util::geometry::ScreenPx;
-use util::opts::{self, RenderApi};
+use util::opts;
+#[cfg(not(target_os = "android"))]
+use util::opts::RenderApi;
 
 static mut g_nested_event_loop_listener: Option<*mut (NestedEventLoopListener + 'static)> = None;
 

ports/gonk/Cargo.lock

@@ -145,7 +145,6 @@ dependencies = [
  "gfx_traits 0.0.1",
  "gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
- "layers 0.2.4 (git+https://github.com/servo/rust-layers)",
  "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "num 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)",
  "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -165,11 +164,9 @@ dependencies = [
  "heapsize 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize_plugin 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
- "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "plugins 0.0.1",
  "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "util 0.0.1",
  "webrender_traits 0.1.0 (git+https://github.com/servo/webrender_traits)",
 ]
 
@@ -371,7 +368,6 @@ dependencies = [
  "devtools_traits 0.0.1",
  "hyper 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ipc-channel 0.2.2 (git+https://github.com/servo/ipc-channel)",
- "log 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "msg 0.0.1",
  "plugins 0.0.1",
  "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -396,7 +392,6 @@ dependencies = [
  "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "time 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "url 0.5.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "util 0.0.1",
 ]
 
 [[package]]
@@ -659,7 +654,6 @@ dependencies = [
  "plugins 0.0.1",
  "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "util 0.0.1",
 ]
 
 [[package]]
@@ -964,7 +958,6 @@ dependencies = [
  "script 0.0.1",
  "script_traits 0.0.1",
  "selectors 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_json 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde_macros 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1705,7 +1698,6 @@ dependencies = [
  "msg 0.0.1",
  "net 0.0.1",
  "net_traits 0.0.1",
- "offscreen_gl_context 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "profile 0.0.1",
  "profile_traits 0.0.1",
  "script 0.0.1",