diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-08-26 15:01:12 -0600 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-08-26 15:01:12 -0600 |
| commit | 48945b0fc1b1f1bee77f6cb30ac10e17614ef283 (patch) | |
| tree | 9dab2aee27ae876d8ac18f946c8c18a75f16868d /components/script/dom/htmloptionelement.rs | |
| parent | fa5ad1c6b4faa2c43ff79e77962b94034a4f2bd0 (diff) | |
| parent | 4678ec16bb7e3aa242f30d6a9d675d5aeaec7cf7 (diff) | |
| download | servo-48945b0fc1b1f1bee77f6cb30ac10e17614ef283.tar.gz servo-48945b0fc1b1f1bee77f6cb30ac10e17614ef283.zip | |
Auto merge of #7397 - Manishearth:doublepointer-meet-fire, r=nox
Remove doublepointer in VirtualMethods, and from_borrowed_ref
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7397)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/htmloptionelement.rs')
| -rw-r--r-- | components/script/dom/htmloptionelement.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/script/dom/htmloptionelement.rs b/components/script/dom/htmloptionelement.rs index 55685d6527f..dbb3486052c 100644 --- a/components/script/dom/htmloptionelement.rs +++ b/components/script/dom/htmloptionelement.rs @@ -128,9 +128,9 @@ impl<'a> HTMLOptionElementMethods for &'a HTMLOptionElement { } -impl<'a> VirtualMethods for &'a HTMLOptionElement { +impl VirtualMethods for HTMLOptionElement { fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> { - let htmlelement: &&HTMLElement = HTMLElementCast::from_borrowed_ref(self); + let htmlelement: &HTMLElement = HTMLElementCast::from_ref(self); Some(htmlelement as &VirtualMethods) } @@ -141,7 +141,7 @@ impl<'a> VirtualMethods for &'a HTMLOptionElement { match attr.local_name() { &atom!("disabled") => { - let node = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(self); node.set_disabled_state(true); node.set_enabled_state(false); }, @@ -156,7 +156,7 @@ impl<'a> VirtualMethods for &'a HTMLOptionElement { match attr.local_name() { &atom!("disabled") => { - let node = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(self); node.set_disabled_state(false); node.set_enabled_state(true); node.check_parent_disabled_state_for_option(); @@ -170,7 +170,7 @@ impl<'a> VirtualMethods for &'a HTMLOptionElement { s.bind_to_tree(tree_in_doc); } - let node = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(self); node.check_parent_disabled_state_for_option(); } @@ -179,7 +179,7 @@ impl<'a> VirtualMethods for &'a HTMLOptionElement { s.unbind_from_tree(tree_in_doc); } - let node = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(self); if node.GetParentNode().is_some() { node.check_parent_disabled_state_for_option(); } else { |