mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
c831c2c0a5
Now that JSRef<T> is gone, there is no need to have helper traits.
On components/script/*.rs:
# Remove imports.
/^ *use dom::[a-z]+::\{.*Helpers/ {
s/\{(Raw[^L]|[^L][^a])[a-zA-Z]+Helpers, /\{/
s/, (Raw[^L]|[^L][^a])[a-zA-Z]+Helpers([,}])/\2/g
s/\{([a-zA-Z]+)\}/\1/
/\{\}/d
s/::self;$/;/
}
/^ *use dom::[a-z]+::\{?(Raw[^L]|[^L][^a])[a-zA-Z]+Helpers\}?;$/d
On components/script/dom/*.rs:
# Ignore layout things.
/^(pub )?(impl|trait).*Layout.* \{/,/^}$/ { P; D; }
# Delete helpers traits.
/^(pub )?trait ([^L][^ ]|L[^a])[^ ]+Helpers(<'a>)? \{$/,/^\}$/D
# Patch private helpers.
/^impl.*Private.*Helpers/,/^\}$/ {
s/^impl<'a> Private([^L][^ ]|L[^a])[^ ]+Helpers(<'a>)? for &'a ([^ ]+) \{$/impl \3 {/
/^ *(unsafe )?fn .*\(self.*[<&]'a/ {
s/&'a /\&/g
s/<'a, /</g
}
/^ *(unsafe )?fn /s/\(self([,)])/\(\&self\1/
}
# Patch public helpers.
/^impl.*Helpers/,/^\}$/ {
s/^impl(<'a>)? ([^L][^ ]|L[^a])[^ ]+Helpers(<'a>)? for (&'a )?([^ ]+) \{$/impl \5 {/
/^ *(unsafe )?fn .*\(self.*[<&]'a/ {
s/&'a /\&/g
s/<'a, /</g
}
/^ *(unsafe )?fn .*\(&?self[,)]/s/(unsafe )?fn/pub &/
/^ *pub (unsafe )?fn /s/\(self([,)])/\(\&self\1/
}
The few error cases were then fixed by hand.
48 lines
1.8 KiB
Rust
48 lines
1.8 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
use dom::bindings::codegen::Bindings::EventHandlerBinding::EventHandlerNonNull;
|
|
use dom::bindings::codegen::Bindings::XMLHttpRequestEventTargetBinding::XMLHttpRequestEventTargetMethods;
|
|
use dom::bindings::codegen::InheritTypes::EventTargetCast;
|
|
use dom::bindings::codegen::InheritTypes::XMLHttpRequestEventTargetDerived;
|
|
use dom::eventtarget::{EventTarget, EventTargetTypeId};
|
|
|
|
#[derive(JSTraceable, Copy, Clone, PartialEq, HeapSizeOf)]
|
|
pub enum XMLHttpRequestEventTargetTypeId {
|
|
XMLHttpRequest,
|
|
XMLHttpRequestUpload,
|
|
}
|
|
|
|
#[dom_struct]
|
|
pub struct XMLHttpRequestEventTarget {
|
|
eventtarget: EventTarget,
|
|
}
|
|
|
|
impl XMLHttpRequestEventTarget {
|
|
pub fn new_inherited(type_id: XMLHttpRequestEventTargetTypeId) -> XMLHttpRequestEventTarget {
|
|
XMLHttpRequestEventTarget {
|
|
eventtarget: EventTarget::new_inherited(EventTargetTypeId::XMLHttpRequestEventTarget(type_id))
|
|
}
|
|
}
|
|
}
|
|
|
|
impl XMLHttpRequestEventTargetDerived for EventTarget {
|
|
fn is_xmlhttprequesteventtarget(&self) -> bool {
|
|
match *self.type_id() {
|
|
EventTargetTypeId::XMLHttpRequestEventTarget(_) => true,
|
|
_ => false
|
|
}
|
|
}
|
|
|
|
}
|
|
|
|
impl<'a> XMLHttpRequestEventTargetMethods for &'a XMLHttpRequestEventTarget {
|
|
event_handler!(loadstart, GetOnloadstart, SetOnloadstart);
|
|
event_handler!(progress, GetOnprogress, SetOnprogress);
|
|
event_handler!(abort, GetOnabort, SetOnabort);
|
|
event_handler!(error, GetOnerror, SetOnerror);
|
|
event_handler!(load, GetOnload, SetOnload);
|
|
event_handler!(timeout, GetOntimeout, SetOntimeout);
|
|
event_handler!(loadend, GetOnloadend, SetOnloadend);
|
|
}
|