From c9f50f41b56f99f714f2297c5fdfc04b0b06da24 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Sat, 27 Jun 2015 18:23:05 +0200 Subject: [PATCH] Stop using position_elem. It is unstable and not really better than the stable alternative. --- components/script/dom/eventtarget.rs | 5 ++--- components/script/lib.rs | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs index bbb26623052..ab8da892376 100644 --- a/components/script/dom/eventtarget.rs +++ b/components/script/dom/eventtarget.rs @@ -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); } } diff --git a/components/script/lib.rs b/components/script/lib.rs index c6456be5d74..f2cb468d61f 100644 --- a/components/script/lib.rs +++ b/components/script/lib.rs @@ -19,7 +19,6 @@ #![feature(plugin)] #![feature(rc_unique)] #![feature(slice_chars)] -#![feature(slice_position_elem)] #![feature(str_utf16)] #![feature(vec_push_all)]