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

Stop using IndexMut on HashMap.

Browse source 
This feature was removed in https://github.com/rust-lang/rust/pull/23559.
This commit is contained in:
Ms2ger 2015-05-01 21:16:20 +02:00
parent 77f653da2c
commit c95fc0c923
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/gfx/buffer_map.rs
View file

@ -109,7 +109,7 @@ impl BufferMap {
} }
}; };
if { if {
let list = &mut self.map[old_key].buffers; let list = &mut self.map.get_mut(&old_key).unwrap().buffers;
let condemned_buffer = list.pop().take().unwrap(); let condemned_buffer = list.pop().take().unwrap();
self.mem -= condemned_buffer.get_mem(); self.mem -= condemned_buffer.get_mem();
condemned_buffer.destroy(graphics_context); condemned_buffer.destroy(graphics_context);

8
components/gfx/font_cache_task.rs
View file

@ -139,7 +139,7 @@ impl FontCache {
let maybe_resource = load_whole_resource(&self.resource_task, url.clone()); let maybe_resource = load_whole_resource(&self.resource_task, url.clone());
match maybe_resource { match maybe_resource {
Ok((_, bytes)) => { Ok((_, bytes)) => {
let family = &mut self.web_families[family_name]; let family = &mut self.web_families.get_mut(&family_name).unwrap();
family.add_template(&url.to_string(), Some(bytes)); family.add_template(&url.to_string(), Some(bytes));
}, },
Err(_) => { Err(_) => {
@ -148,7 +148,7 @@ impl FontCache {
} }
} }
Source::Local(ref local_family_name) => { Source::Local(ref local_family_name) => {
let family = &mut self.web_families[family_name]; let family = &mut self.web_families.get_mut(&family_name).unwrap();
get_variations_for_family(&local_family_name, |path| { get_variations_for_family(&local_family_name, |path| {
family.add_template(&path, None); family.add_template(&path, None);
}); });
@ -188,7 +188,7 @@ impl FontCache {
// look up canonical name // look up canonical name
if self.local_families.contains_key(family_name) { if self.local_families.contains_key(family_name) {
debug!("FontList: Found font family with name={}", &**family_name); debug!("FontList: Found font family with name={}", &**family_name);
let s = &mut self.local_families[*family_name]; let s = self.local_families.get_mut(family_name).unwrap();
if s.templates.len() == 0 { if s.templates.len() == 0 {
get_variations_for_family(&family_name, |path| { get_variations_for_family(&family_name, |path| {
@ -213,7 +213,7 @@ impl FontCache {
fn find_font_in_web_family<'a>(&'a mut self, family_name: &LowercaseString, desc: &FontTemplateDescriptor) fn find_font_in_web_family<'a>(&'a mut self, family_name: &LowercaseString, desc: &FontTemplateDescriptor)
-> Option<Arc<FontTemplateData>> { -> Option<Arc<FontTemplateData>> {
if self.web_families.contains_key(family_name) { if self.web_families.contains_key(family_name) {
let family = &mut self.web_families[*family_name]; let family = self.web_families.get_mut(family_name).unwrap();
let maybe_font = family.find_font_for_style(desc, &self.font_context); let maybe_font = family.find_font_for_style(desc, &self.font_context);
maybe_font maybe_font
} else { } else {