on master help sign in
rustfmt
a0a1e50Nick Fitzgerald
src/change_list.rs+15−35
@@ -310,7 +310,7 @@ impl ChangeList {
310 ChangeDiscriminant::AddString,
310 ChangeDiscriminant::AddString,
311 string.as_ptr() as u32,
311 string.as_ptr() as u32,
312 string.len() as u32,
312 string.len() as u32,
313− key
313+ key,
314 );
314 );
315 key
315 key
316 }
316 }
@@ -321,12 +321,15 @@ impl ChangeList {
321 let mut new_cache = FxHashMap::default();
321 let mut new_cache = FxHashMap::default();
322 for (key, val) in self.strings_cache.iter() {
322 for (key, val) in self.strings_cache.iter() {
323 if val.used {
323 if val.used {
324+ new_cache.insert(
325+ key.clone(),
324− new_cache.insert(key.clone(), StringsCacheEntry { key: val.key, used: false });
326+ StringsCacheEntry {
325− } else {
327+ key: val.key,
326− self.op1(
328+ used: false,
327− ChangeDiscriminant::DropString,
329+ },
328− val.key,
329 );
330 );
331+ } else {
332+ self.op1(ChangeDiscriminant::DropString, val.key);
330 }
333 }
331 }
334 }
332 self.strings_cache = new_cache;
335 self.strings_cache = new_cache;
@@ -355,20 +358,13 @@ impl ChangeList {
355 debug!("emit_set_attribute({:?}, {:?})", name, value);
358 debug!("emit_set_attribute({:?}, {:?})", name, value);
356 let name_id = self.ensure_string(name);
359 let name_id = self.ensure_string(name);
357 let value_id = self.ensure_string(value);
360 let value_id = self.ensure_string(value);
358− self.op2(
359− ChangeDiscriminant::SetAttribute,
361+ self.op2(ChangeDiscriminant::SetAttribute, name_id, value_id);
360− name_id,
361− value_id,
362− );
363 }
362 }
364
363
365 pub(crate) fn emit_remove_attribute(&mut self, name: &str) {
364 pub(crate) fn emit_remove_attribute(&mut self, name: &str) {
366 debug!("emit_remove_attribute({:?})", name);
365 debug!("emit_remove_attribute({:?})", name);
367 let name_id = self.ensure_string(name);
366 let name_id = self.ensure_string(name);
368− self.op1(
369− ChangeDiscriminant::RemoveAttribute,
367+ self.op1(ChangeDiscriminant::RemoveAttribute, name_id);
370− name_id,
371− );
372 }
368 }
373
369
374 pub(crate) fn emit_push_first_child(&self) {
370 pub(crate) fn emit_push_first_child(&self) {
@@ -403,10 +399,7 @@ impl ChangeList {
403 pub(crate) fn emit_create_element(&mut self, tag_name: &str) {
399 pub(crate) fn emit_create_element(&mut self, tag_name: &str) {
404 debug!("emit_create_element({:?})", tag_name);
400 debug!("emit_create_element({:?})", tag_name);
405 let tag_name_id = self.ensure_string(tag_name);
401 let tag_name_id = self.ensure_string(tag_name);
406− self.op1(
407− ChangeDiscriminant::CreateElement,
402+ self.op1(ChangeDiscriminant::CreateElement, tag_name_id);
408− tag_name_id,
409− );
410 }
403 }
411
404
412 pub(crate) fn emit_new_event_listener(&mut self, listener: &Listener) {
405 pub(crate) fn emit_new_event_listener(&mut self, listener: &Listener) {
@@ -414,12 +407,7 @@ impl ChangeList {
414 let (a, b) = listener.get_callback_parts();
407 let (a, b) = listener.get_callback_parts();
415 debug_assert!(a != 0);
408 debug_assert!(a != 0);
416 let event_id = self.ensure_string(listener.event);
409 let event_id = self.ensure_string(listener.event);
417− self.op3(
418− ChangeDiscriminant::NewEventListener,
410+ self.op3(ChangeDiscriminant::NewEventListener, event_id, a, b);
419− event_id,
420− a,
421− b,
422− );
423 }
411 }
424
412
425 pub(crate) fn emit_update_event_listener(&mut self, listener: &Listener) {
413 pub(crate) fn emit_update_event_listener(&mut self, listener: &Listener) {
@@ -427,20 +415,12 @@ impl ChangeList {
427 let (a, b) = listener.get_callback_parts();
415 let (a, b) = listener.get_callback_parts();
428 debug_assert!(a != 0);
416 debug_assert!(a != 0);
429 let event_id = self.ensure_string(listener.event);
417 let event_id = self.ensure_string(listener.event);
430− self.op3(
431− ChangeDiscriminant::UpdateEventListener,
418+ self.op3(ChangeDiscriminant::UpdateEventListener, event_id, a, b);
432− event_id,
433− a,
434− b,
435− );
436 }
419 }
437
420
438 pub(crate) fn emit_remove_event_listener(&mut self, event: &str) {
421 pub(crate) fn emit_remove_event_listener(&mut self, event: &str) {
439 debug!("emit_remove_event_listener({:?})", event);
422 debug!("emit_remove_event_listener({:?})", event);
440 let event_id = self.ensure_string(event);
423 let event_id = self.ensure_string(event);
441− self.op1(
442− ChangeDiscriminant::RemoveEventListener,
424+ self.op1(ChangeDiscriminant::RemoveEventListener, event_id);
443− event_id,
444− );
445 }
425 }
446}
426}