diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2016-05-17 15:28:51 +0200 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2016-05-17 15:30:14 +0200 |
commit | 60aaac51750ef1234b37b3923d0e98d646d85a98 (patch) | |
tree | addd429466d4496f13d83b9bfef673e43560b5c4 /components/script/dom/eventtarget.rs | |
parent | 2ab7f1366c6e4524341d72229a16cfda10c0857c (diff) | |
download | servo-60aaac51750ef1234b37b3923d0e98d646d85a98.tar.gz servo-60aaac51750ef1234b37b3923d0e98d646d85a98.zip |
Remove the custom PartialEq implementations on TypeId enums
https://github.com/rust-lang/rust/pull/33593 made them useless.
Diffstat (limited to 'components/script/dom/eventtarget.rs')
-rw-r--r-- | components/script/dom/eventtarget.rs | 40 |
1 files changed, 2 insertions, 38 deletions
diff --git a/components/script/dom/eventtarget.rs b/components/script/dom/eventtarget.rs index 3b492be7d4a..3b20120628d 100644 --- a/components/script/dom/eventtarget.rs +++ b/components/script/dom/eventtarget.rs @@ -13,7 +13,7 @@ use dom::bindings::codegen::Bindings::EventTargetBinding::EventTargetMethods; use dom::bindings::codegen::Bindings::WindowBinding::WindowMethods; use dom::bindings::codegen::UnionTypes::EventOrString; use dom::bindings::error::{Error, Fallible, report_pending_exception}; -use dom::bindings::inheritance::{Castable, EventTargetTypeId}; +use dom::bindings::inheritance::Castable; use dom::bindings::js::Root; use dom::bindings::reflector::{Reflectable, Reflector}; use dom::element::Element; @@ -35,8 +35,8 @@ use std::ffi::CString; use std::hash::BuildHasherDefault; use std::mem; use std::ops::{Deref, DerefMut}; +use std::ptr; use std::rc::Rc; -use std::{intrinsics, ptr}; use string_cache::Atom; use url::Url; use util::str::DOMString; @@ -62,42 +62,6 @@ pub enum ListenerPhase { Bubbling, } -impl PartialEq for EventTargetTypeId { - #[inline] - fn eq(&self, other: &EventTargetTypeId) -> bool { - match (*self, *other) { - (EventTargetTypeId::Node(this_type), EventTargetTypeId::Node(other_type)) => { - this_type == other_type - } - _ => self.eq_slow(other) - } - } -} - -impl EventTargetTypeId { - #[allow(unsafe_code)] - fn eq_slow(&self, other: &EventTargetTypeId) -> bool { - match (*self, *other) { - (EventTargetTypeId::Node(this_type), EventTargetTypeId::Node(other_type)) => { - this_type == other_type - } - (EventTargetTypeId::WorkerGlobalScope(this_type), - EventTargetTypeId::WorkerGlobalScope(other_type)) => { - this_type == other_type - } - (EventTargetTypeId::XMLHttpRequestEventTarget(this_type), - EventTargetTypeId::XMLHttpRequestEventTarget(other_type)) => { - this_type == other_type - } - (_, _) => { - unsafe { - intrinsics::discriminant_value(self) == intrinsics::discriminant_value(other) - } - } - } - } -} - /// https://html.spec.whatwg.org/multipage/#internal-raw-uncompiled-handler #[derive(JSTraceable, Clone, PartialEq)] pub struct InternalRawUncompiledHandler { |