auto merge of #5477 : jdm/servo/warnfix, r=kmcallister

This commit is contained in:
bors-servo 2015-04-01 17:30:41 -06:00
commit 3294778b37
3 changed files with 1 additions and 2 deletions

View file

@ -12,7 +12,6 @@ use font_cache_task::FontCacheTask;
use font_template::FontTemplateDescriptor; use font_template::FontTemplateDescriptor;
use platform::font::FontHandle; use platform::font::FontHandle;
use platform::font_template::FontTemplateData; use platform::font_template::FontTemplateData;
use util::arc_ptr_eq;
use util::cache::HashCache; use util::cache::HashCache;
use util::fnv::FnvHasher; use util::fnv::FnvHasher;
use util::geometry::Au; use util::geometry::Au;

View file

@ -8,6 +8,7 @@
#![feature(box_syntax)] #![feature(box_syntax)]
#![feature(core)] #![feature(core)]
#![feature(collections)] #![feature(collections)]
#![feature(hash)]
#![feature(rustc_private)] #![feature(rustc_private)]
#![plugin(string_cache_plugin)] #![plugin(string_cache_plugin)]

View file

@ -1460,7 +1460,6 @@ pub mod longhands {
<%self:longhand name="font-family"> <%self:longhand name="font-family">
use self::computed_value::FontFamily; use self::computed_value::FontFamily;
use std::borrow::ToOwned;
use string_cache::Atom; use string_cache::Atom;
use values::computed::ComputedValueAsSpecified; use values::computed::ComputedValueAsSpecified;