diff -r c78880e58206 -r 8ccb9c3cbe47 mozilla-rust-1.23.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/mozilla-rust-1.23.patch Wed Jan 10 22:19:23 2018 +0100 @@ -0,0 +1,1083 @@ + +# HG changeset patch +# User Simon Sapin +# Date 1510231769 21600 +# Node ID 3242ac6fdb3879f723145e6b07fff04a5c960d1e +# Parent bf63b9d8f2410464d5f2526588e380f934e937cc +servo: Merge #19162 - Allow unused imports for AsciiExt in style code (from emilio:ascii-ext); r=emilio + +See #19128, this part is cherry-picked so Gecko can build with rust nightly. + +Source-Repo: https://github.com/servo/servo +Source-Revision: e7a654dd13f589e127193267bcb576ffd661c11d + +diff --git a/servo/components/gfx/font.rs b/servo/components/gfx/font.rs +--- a/servo/components/gfx/font.rs ++++ b/servo/components/gfx/font.rs +@@ -5,17 +5,17 @@ + use app_units::Au; + use euclid::{Point2D, Rect, Size2D}; + use font_template::FontTemplateDescriptor; + use ordered_float::NotNaN; + use platform::font::{FontHandle, FontTable}; + use platform::font_context::FontContextHandle; + use platform::font_template::FontTemplateData; + use smallvec::SmallVec; +-use std::ascii::AsciiExt; ++#[allow(unused_imports)] use std::ascii::AsciiExt; + use std::borrow::ToOwned; + use std::cell::RefCell; + use std::collections::HashMap; + use std::rc::Rc; + use std::str; + use std::sync::Arc; + use std::sync::atomic::{ATOMIC_USIZE_INIT, AtomicUsize, Ordering}; + use style::computed_values::{font_stretch, font_variant_caps, font_weight}; +diff --git a/servo/components/net/fetch/cors_cache.rs b/servo/components/net/fetch/cors_cache.rs +--- a/servo/components/net/fetch/cors_cache.rs ++++ b/servo/components/net/fetch/cors_cache.rs +@@ -7,17 +7,17 @@ + //! For stuff involving ``, `