From 7a2b43ae8d5727fe0969061df72e91e3fc470ec6 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Wed, 5 Aug 2015 03:44:22 -0600
Subject: [PATCH] servo: Merge #6959 - Fix warnings (from servo:warnings_);
 r=jdm

Adds on top of #6949.

Source-Repo: https://github.com/servo/servo
Source-Revision: 0d8825c25c6eed4dc22b10e668b03fc79056702b
---
 servo/components/gfx/text/shaping/harfbuzz.rs | 1 -
 servo/components/script/devtools.rs           | 1 -
 servo/components/script/dom/element.rs        | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/servo/components/gfx/text/shaping/harfbuzz.rs b/servo/components/gfx/text/shaping/harfbuzz.rs
index 1359c304feed..f87906325e0c 100644
--- a/servo/components/gfx/text/shaping/harfbuzz.rs
+++ b/servo/components/gfx/text/shaping/harfbuzz.rs
@@ -27,7 +27,6 @@ use harfbuzz::{hb_feature_t};
 use harfbuzz::{RUST_hb_font_create};
 use harfbuzz::{RUST_hb_font_destroy, RUST_hb_buffer_create};
 use harfbuzz::{RUST_hb_font_funcs_create};
-use harfbuzz::{RUST_hb_font_funcs_destroy};
 use harfbuzz::{RUST_hb_font_funcs_set_glyph_func};
 use harfbuzz::{RUST_hb_font_funcs_set_glyph_h_advance_func};
 use harfbuzz::{RUST_hb_font_funcs_set_glyph_h_kerning_func};
diff --git a/servo/components/script/devtools.rs b/servo/components/script/devtools.rs
index 8b4dfb12e6f5..3307eb20dc30 100644
--- a/servo/components/script/devtools.rs
+++ b/servo/components/script/devtools.rs
@@ -7,7 +7,6 @@ use devtools_traits::{EvaluateJSReply, NodeInfo, Modification, TimelineMarker, T
 use devtools_traits::{ConsoleAPI, PageError};
 use dom::bindings::conversions::jsstring_to_str;
 use dom::bindings::conversions::FromJSValConvertible;
-use dom::bindings::conversions::StringificationBehavior;
 use dom::bindings::js::Root;
 use dom::bindings::codegen::InheritTypes::{NodeCast, ElementCast};
 use dom::bindings::codegen::Bindings::DocumentBinding::DocumentMethods;
diff --git a/servo/components/script/dom/element.rs b/servo/components/script/dom/element.rs
index 1b200ed4e618..8ebcfc3f3dca 100644
--- a/servo/components/script/dom/element.rs
+++ b/servo/components/script/dom/element.rs
@@ -67,7 +67,7 @@ use smallvec::VecLike;
 use style::legacy::{UnsignedIntegerAttribute, from_declaration};
 use style::properties::{PropertyDeclarationBlock, PropertyDeclaration, parse_style_attribute};
 use style::properties::DeclaredValue::SpecifiedValue;
-use style::properties::longhands::{self, background_image, border_spacing, height};
+use style::properties::longhands::{self, background_image, border_spacing};
 use style::values::CSSFloat;
 use style::values::specified::{self, CSSColor, CSSRGBA};
 use util::geometry::Au;