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

Remove the Option<Self> arguments from IDLInterface.

Browse source
This commit is contained in:
Ms2ger 2015-02-19 09:52:48 +01:00
parent dc31d96f65
commit c58213b698
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script/dom/bindings/codegen/CodegenRust.py
View file

@ -1920,10 +1920,10 @@ class CGIDLInterface(CGThing):
} }
return string.Template("""\ return string.Template("""\
impl IDLInterface for ${type} { impl IDLInterface for ${type} {
fn get_prototype_id(_: Option<${type}>) -> PrototypeList::ID { fn get_prototype_id() -> PrototypeList::ID {
PrototypeList::ID::${type} PrototypeList::ID::${type}
} }
fn get_prototype_depth(_: Option<${type}>) -> uint { fn get_prototype_depth() -> uint {
${depth} ${depth}
} }
} }

10
components/script/dom/bindings/conversions.rs
View file

@ -57,14 +57,12 @@ use std::slice;
/// A trait to retrieve the constants necessary to check if a `JSObject` /// A trait to retrieve the constants necessary to check if a `JSObject`
/// implements a given interface. /// implements a given interface.
// FIXME (https://github.com/rust-lang/rfcs/pull/4)
// remove Option<Self> arguments.
pub trait IDLInterface { pub trait IDLInterface {
/// Returns the prototype ID. /// Returns the prototype ID.
fn get_prototype_id(_: Option<Self>) -> PrototypeList::ID; fn get_prototype_id() -> PrototypeList::ID;
/// Returns the prototype depth, i.e., the number of interfaces this /// Returns the prototype depth, i.e., the number of interfaces this
/// interface inherits from. /// interface inherits from.
fn get_prototype_depth(_: Option<Self>) -> uint; fn get_prototype_depth() -> uint;
} }
/// A trait to convert Rust types to `JSVal`s. /// A trait to convert Rust types to `JSVal`s.
@ -489,8 +487,8 @@ pub fn unwrap_jsmanaged<T>(mut obj: *mut JSObject) -> Result<Unrooted<T>, ()>
} }
})); }));
let proto_id = IDLInterface::get_prototype_id(None::<T>); let proto_id = <T as IDLInterface>::get_prototype_id();
let proto_depth = IDLInterface::get_prototype_depth(None::<T>); let proto_depth = <T as IDLInterface>::get_prototype_depth();
if dom_class.interface_chain[proto_depth] == proto_id { if dom_class.interface_chain[proto_depth] == proto_id {
debug!("good prototype"); debug!("good prototype");
Ok(Unrooted::from_raw(unwrap(obj))) Ok(Unrooted::from_raw(unwrap(obj)))