aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-04-23 07:51:44 -0700
committerbors-servo <lbergstrom+bors@mozilla.com>2016-04-23 07:51:44 -0700
commit305c283602882850be9d39c43b980d0fc0f93a3c (patch)
tree2c4e7ffce0d9ac5a8a68914640ac70edcc7d38da
parent75ae1c033f41a0c9537c693c546a08cdbddc9dd3 (diff)
parent97637d89490ac170ebec7a9a995ba15a58bc81f3 (diff)
downloadservo-305c283602882850be9d39c43b980d0fc0f93a3c.tar.gz
servo-305c283602882850be9d39c43b980d0fc0f93a3c.zip
Auto merge of #10823 - jdm:import, r=frewsxcv
Squash unused import and unused crate warnings. <!-- Reviewable:start --> This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10823) <!-- Reviewable:end -->
-rw-r--r--components/compositing/Cargo.toml4
-rw-r--r--components/compositing/lib.rs4
-rw-r--r--components/plugins/utils.rs1
-rw-r--r--components/servo/Cargo.lock3
-rw-r--r--ports/cef/Cargo.lock3
-rw-r--r--ports/glutin/Cargo.toml3
-rw-r--r--ports/glutin/lib.rs1
-rw-r--r--ports/gonk/Cargo.lock2
8 files changed, 0 insertions, 21 deletions
diff --git a/components/compositing/Cargo.toml b/components/compositing/Cargo.toml
index eac352b1d51..1af3b4047c7 100644
--- a/components/compositing/Cargo.toml
+++ b/components/compositing/Cargo.toml
@@ -98,7 +98,3 @@ serde = "0.7"
serde_macros = "0.7"
time = "0.1.17"
url = {version = "0.5.7", features = ["heap_size"]}
-
-[target.x86_64-apple-darwin.dependencies]
-core-graphics = "0.3"
-core-text = "1.1"
diff --git a/components/compositing/lib.rs b/components/compositing/lib.rs
index eafe95a272a..22ebd94f187 100644
--- a/components/compositing/lib.rs
+++ b/components/compositing/lib.rs
@@ -18,10 +18,6 @@ extern crate azure;
extern crate canvas;
extern crate canvas_traits;
extern crate clipboard;
-#[cfg(target_os = "macos")]
-extern crate core_graphics;
-#[cfg(target_os = "macos")]
-extern crate core_text;
extern crate devtools_traits;
extern crate euclid;
#[cfg(not(target_os = "windows"))]
diff --git a/components/plugins/utils.rs b/components/plugins/utils.rs
index b39102f5626..3b96bedd0f1 100644
--- a/components/plugins/utils.rs
+++ b/components/plugins/utils.rs
@@ -3,7 +3,6 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
use rustc::hir::def_id::DefId;
-use rustc::hir::map as ast_map;
use rustc::hir::{self, def};
use rustc::lint::{LateContext, LintContext};
use syntax::ast;
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index ed25d333ea3..8a1ec6efade 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -285,8 +285,6 @@ dependencies = [
"canvas 0.0.1",
"canvas_traits 0.0.1",
"clipboard 0.1.2 (git+https://github.com/aweinstock314/rust-clipboard)",
- "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"devtools_traits 0.0.1",
"euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"gaol 0.0.1 (git+https://github.com/servo/gaol)",
@@ -770,7 +768,6 @@ name = "glutin_app"
version = "0.0.1"
dependencies = [
"bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"compositing 0.0.1",
"euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index b766c6025cd..66ad5d520f6 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -255,8 +255,6 @@ dependencies = [
"canvas 0.0.1",
"canvas_traits 0.0.1",
"clipboard 0.1.2 (git+https://github.com/aweinstock314/rust-clipboard)",
- "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"devtools_traits 0.0.1",
"euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"gaol 0.0.1 (git+https://github.com/servo/gaol)",
@@ -690,7 +688,6 @@ name = "glutin_app"
version = "0.0.1"
dependencies = [
"bitflags 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "cgl 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
"compositing 0.0.1",
"euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"gleam 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/glutin/Cargo.toml b/ports/glutin/Cargo.toml
index c292f105a0c..f99c868536d 100644
--- a/ports/glutin/Cargo.toml
+++ b/ports/glutin/Cargo.toml
@@ -48,8 +48,5 @@ x11 = "2.0.0"
[target.aarch64-unknown-linux-gnu.dependencies]
x11 = "2.0.0"
-[target.x86_64-apple-darwin.dependencies]
-cgl = "0.1"
-
[target.arm-linux-androideabi.dependencies]
servo-egl = "0.2"
diff --git a/ports/glutin/lib.rs b/ports/glutin/lib.rs
index 367ae7bc71b..5c984fbc691 100644
--- a/ports/glutin/lib.rs
+++ b/ports/glutin/lib.rs
@@ -7,7 +7,6 @@
#![feature(box_syntax)]
#[macro_use] extern crate bitflags;
-#[cfg(target_os = "macos")] extern crate cgl;
extern crate compositing;
#[allow(unused_extern_crates)]
#[cfg(target_os = "android")] extern crate egl;
diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock
index c9b62a89bf5..03f8e092d41 100644
--- a/ports/gonk/Cargo.lock
+++ b/ports/gonk/Cargo.lock
@@ -248,8 +248,6 @@ dependencies = [
"canvas 0.0.1",
"canvas_traits 0.0.1",
"clipboard 0.1.2 (git+https://github.com/aweinstock314/rust-clipboard)",
- "core-graphics 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "core-text 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"devtools_traits 0.0.1",
"euclid 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)",
"gaol 0.0.1 (git+https://github.com/servo/gaol)",