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

Remove unnecessary clone in LRUCache::touch

Browse source
This commit is contained in:
Matt Brubeck 2016-05-13 18:13:53 -07:00
parent d2717c4475
commit dc6be7bba5
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/matching.rs
View file

@ -351,7 +351,7 @@ impl<C: ComputedValues> StyleSharingCandidateCache<C> {
}
pub fn touch(&mut self, index: usize) {
self.cache.touch(index)
self.cache.touch(index);
}
}

8
components/util/cache.rs
View file

@ -70,13 +70,13 @@ impl<K: PartialEq, V: Clone> LRUCache<K, V> {
}
#[inline]
pub fn touch(&mut self, pos: usize) -> V {
pub fn touch(&mut self, pos: usize) -> &V {
let last_index = self.entries.len() - 1;
if pos != last_index {
let entry = self.entries.remove(pos);
self.entries.push(entry);
}
self.entries[last_index].1.clone()
&self.entries[last_index].1
}
pub fn iter(&self) -> Iter<(K, V)> {
@ -92,14 +92,14 @@ impl<K: PartialEq, V: Clone> LRUCache<K, V> {
pub fn find(&mut self, key: &K) -> Option<V> {
match self.entries.iter().position(|&(ref k, _)| key == k) {
Some(pos) => Some(self.touch(pos)),
Some(pos) => Some(self.touch(pos).clone()),
None => None,
}
}
pub fn find_or_create<F>(&mut self, key: K, mut blk: F) -> V where F: FnMut() -> V {
match self.entries.iter().position(|&(ref k, _)| *k == key) {
Some(pos) => self.touch(pos),
Some(pos) => self.touch(pos).clone(),
None => {
let val = blk();
self.insert(key, val.clone());