Update to string-cache 0.3

components/gfx/Cargo.toml

@@ -32,9 +32,9 @@ plugins = {path = "../plugins"}
 range = {path = "../range"}
 rustc-serialize = "0.3"
 serde = "0.8"
+servo_atoms = {path = "../atoms"}
 serde_derive = "0.8"
 smallvec = "0.1"
-string_cache = {version = "0.2.26", features = ["heap_size"]}
 style = {path = "../style"}
 style_traits = {path = "../style_traits"}
 time = "0.1.12"

components/gfx/font_cache_thread.rs

@@ -14,13 +14,13 @@ use platform::font_list::for_each_variation;
 use platform::font_list::last_resort_font_families;
 use platform::font_list::system_default_family;
 use platform::font_template::FontTemplateData;
+use servo_atoms::Atom;
 use std::borrow::ToOwned;
 use std::collections::HashMap;
 use std::mem;
 use std::ops::Deref;
 use std::sync::{Arc, Mutex};
 use std::u32;
-use string_cache::Atom;
 use style::font_face::{EffectiveSources, Source};
 use style::properties::longhands::font_family::computed_value::FontFamily;
 use url::Url;

components/gfx/font_template.rs

@@ -6,11 +6,11 @@ use font::FontHandleMethods;
 use platform::font::FontHandle;
 use platform::font_context::FontContextHandle;
 use platform::font_template::FontTemplateData;
+use servo_atoms::Atom;
 use std::fmt::{Debug, Error, Formatter};
 use std::io::Error as IoError;
 use std::sync::{Arc, Weak};
 use std::u32;
-use string_cache::Atom;
 use style::computed_values::{font_stretch, font_weight};
 
 /// Describes how to select a font from a given family. This is very basic at the moment and needs

components/gfx/lib.rs

@@ -71,9 +71,8 @@ extern crate serde_derive;
 #[cfg(any(target_arch = "x86_64", target_arch = "aarch64"))]
 extern crate simd;
 
+#[macro_use] extern crate servo_atoms;
 extern crate smallvec;
-#[macro_use]
-extern crate string_cache;
 extern crate style;
 extern crate style_traits;
 extern crate time;

components/gfx/platform/dummy/font_template.rs

@@ -2,8 +2,8 @@
  * 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/. */
 
+use servo_atoms::Atom;
 use std::io::Error;
-use string_cache::Atom;
 use webrender_traits::NativeFontHandle;
 
 #[derive(Deserialize, Serialize, Debug)]

components/gfx/platform/freetype/font_template.rs

@@ -2,9 +2,9 @@
  * 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/. */
 
+use servo_atoms::Atom;
 use std::fs::File;
 use std::io::{Read, Error};
-use string_cache::Atom;
 use webrender_traits::NativeFontHandle;
 
 /// Platform specific font representation for Linux.

components/gfx/platform/macos/font_template.rs

@@ -9,13 +9,13 @@ use core_text;
 use core_text::font::CTFont;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use serde::de::{Error, Visitor};
+use servo_atoms::Atom;
 use std::borrow::ToOwned;
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::{Read, Error as IoError};
 use std::ops::Deref;
 use std::sync::Mutex;
-use string_cache::Atom;
 use url::Url;
 
 /// Platform specific font representation for mac.

components/gfx/platform/windows/font_template.rs

@@ -3,11 +3,11 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use gdi32;
+use servo_atoms::Atom;
 use std::ffi::OsString;
 use std::io::Error;
 use std::os::windows::ffi::OsStrExt;
 use std::ptr;
-use string_cache::Atom;
 use webrender_traits::NativeFontHandle;
 use winapi::{DWORD, LF_FACESIZE, LOGFONTW, OUT_TT_ONLY_PRECIS, WCHAR};