Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update string_cache to 0.2.

Browse source 
Updated string_cache, html5ever, xml5ever and selectors in Cargo.toml files and Cargo.lock.
Removed references to string_cache_plugin.
Import atom! and ns! from string_cache.
Replaced ns!("") by ns!().
Replaced ns!(XML) and co by ns!(xml) and co.
Replaced atom!(foo) by atom!("foo").
Replaced Atom::from_slice by Atom::from.
Replaced atom.as_slice() by &*atom.
This commit is contained in:
Alan Jeffrey 2015-11-24 13:44:59 -06:00
parent e7b1924948
commit 3dec6edd10
68 changed files with 328 additions and 434 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/gfx/Cargo.toml
View file

@ -22,7 +22,7 @@ rustc-serialize = "0.3"
serde = "0.6"
serde_macros = "0.6"
smallvec = "0.1"
string_cache = "0.1"
string_cache = "0.2"
time = "0.1.12"
unicode-script = { version = "0.1", features = ["harfbuzz"] }

6
components/gfx/font_cache_task.rs
View file

@ -174,7 +174,7 @@ impl FontCache {
Source::Local(ref local_family_name) => {
let family = &mut self.web_families.get_mut(&family_name).unwrap();
for_each_variation(&local_family_name, |path| {
family.add_template(Atom::from_slice(&path), None);
family.add_template(Atom::from(&*path), None);
});
result.send(()).unwrap();
}
@ -182,7 +182,7 @@ impl FontCache {
}
Command::AddDownloadedWebFont(family_name, url, bytes, result) => {
let family = &mut self.web_families.get_mut(&family_name).unwrap();
family.add_template(Atom::from_slice(&url.to_string()), Some(bytes));
family.add_template(Atom::from(&*url.to_string()), Some(bytes));
drop(result.send(()));
}
Command::Exit(result) => {
@ -221,7 +221,7 @@ impl FontCache {
if s.templates.is_empty() {
for_each_variation(family_name, |path| {
s.add_template(Atom::from_slice(&path), None);
s.add_template(Atom::from(&*path), None);
});
}

2
components/gfx/platform/freetype/font_template.rs
View file

@ -24,7 +24,7 @@ impl FontTemplateData {
},
None => {
// TODO: Handle file load failure!
let mut file = File::open(identifier.as_slice()).unwrap();
let mut file = File::open(&*identifier).unwrap();
let mut buffer = vec![];
file.read_to_end(&mut buffer).unwrap();
buffer

2
components/gfx/platform/macos/font_template.rs
View file

@ -57,7 +57,7 @@ impl FontTemplateData {
Err(_) => None
}
}
None => core_text::font::new_from_name(self.identifier.as_slice(), 0.0).ok(),
None => core_text::font::new_from_name(&*self.identifier, 0.0).ok(),
}
}
ctfont.as_ref().map(|ctfont| (*ctfont).clone())