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

Auto merge of #6499 - Ms2ger:slice_position_elem, r=nox

Browse source 
Stop using position_elem.

It is unstable and not really better than the stable alternative.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6499)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-06-27 15:51:35 -06:00
commit 46709edaf8
2 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/script/dom/eventtarget.rs
View file

@ -310,7 +310,7 @@ impl<'a> EventTargetMethods for &'a EventTarget {
phase: phase,
listener: EventListenerType::Additive(listener)
};
if entry.position_elem(&new_entry).is_none() {
if !entry.contains(&new_entry) {
entry.push(new_entry);
}
},
@ -332,8 +332,7 @@ impl<'a> EventTargetMethods for &'a EventTarget {
phase: phase,
listener: EventListenerType::Additive(listener.clone())
};
let position = entry.position_elem(&old_entry);
for &position in position.iter() {
if let Some(position) = entry.iter().position(|e| *e == old_entry) {
entry.remove(position);
}
}

1
components/script/lib.rs
View file

@ -19,7 +19,6 @@
#![feature(plugin)]
#![feature(rc_unique)]
#![feature(slice_chars)]
#![feature(slice_position_elem)]
#![feature(str_utf16)]
#![feature(vec_push_all)]