diff options
| author | Manish Goregaokar <manishsmail@gmail.com> | 2015-08-27 01:07:34 +0530 |
|---|---|---|
| committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-08-27 02:14:48 +0530 |
| commit | b33c5427bc350e42503e2de1a8f832c63522b2d0 (patch) | |
| tree | 95c22ad6ae7e50ba07758f90ed0a6ce112debb32 /components/script/dom/htmlinputelement.rs | |
| parent | 5e83a3f0a3bab226cca849ab33fa3322ef71813d (diff) | |
| download | servo-b33c5427bc350e42503e2de1a8f832c63522b2d0.tar.gz servo-b33c5427bc350e42503e2de1a8f832c63522b2d0.zip | |
Remove doublepointer in VirtualMethods, and from_borrowed_ref
Most of the heavy lifting done by:
```
$ ls *rs | xargs gawk -i inplace '/let .*: &&.*from_borrowed_ref/{sub("&&", "\\&");sub("_borrowed_","_");} {print $0}'
$ ls *rs | xargs gawk -i inplace "/impl.*VirtualMethods/{in_vm=1; sub(/<'a>/,\"\");sub(/&'a /,\"\")} /^}\$/{in_vm=0;} in_vm{\$0=gensub(/\\*self([^.])/,\"self\\\1\",\"g\"); sub(/from_borrowed_ref/,\"from_ref\")} {print}"
```
Diffstat (limited to 'components/script/dom/htmlinputelement.rs')
| -rw-r--r-- | components/script/dom/htmlinputelement.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/components/script/dom/htmlinputelement.rs b/components/script/dom/htmlinputelement.rs index 1985c905220..2116a1b89ac 100644 --- a/components/script/dom/htmlinputelement.rs +++ b/components/script/dom/htmlinputelement.rs @@ -456,9 +456,9 @@ impl<'a> HTMLInputElementHelpers for &'a HTMLInputElement { } } -impl<'a> VirtualMethods for &'a HTMLInputElement { +impl VirtualMethods for HTMLInputElement { 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) } @@ -469,7 +469,7 @@ impl<'a> VirtualMethods for &'a HTMLInputElement { 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); } @@ -532,7 +532,7 @@ impl<'a> VirtualMethods for &'a HTMLInputElement { 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_ancestors_disabled_state_for_form_control(); @@ -548,7 +548,7 @@ impl<'a> VirtualMethods for &'a HTMLInputElement { } &atom!("type") => { if self.input_type.get() == InputType::InputRadio { - broadcast_radio_checked(*self, + broadcast_radio_checked(self, self.get_radio_group_name() .as_ref() .map(|group| &**group)); @@ -584,7 +584,7 @@ impl<'a> VirtualMethods for &'a HTMLInputElement { s.bind_to_tree(tree_in_doc); } - let node = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(self); node.check_ancestors_disabled_state_for_form_control(); } @@ -593,7 +593,7 @@ impl<'a> VirtualMethods for &'a HTMLInputElement { s.unbind_from_tree(tree_in_doc); } - let node = NodeCast::from_ref(*self); + let node = NodeCast::from_ref(self); if node.ancestors().any(|ancestor| ancestor.r().is_htmlfieldsetelement()) { node.check_ancestors_disabled_state_for_form_control(); } else { @@ -617,8 +617,8 @@ impl<'a> VirtualMethods for &'a HTMLInputElement { //TODO: set the editing position for text inputs - let doc = document_from_node(*self); - doc.r().request_focus(ElementCast::from_ref(*self)); + let doc = document_from_node(self); + doc.r().request_focus(ElementCast::from_ref(self)); } else if &*event.Type() == "keydown" && !event.DefaultPrevented() && (self.input_type.get() == InputType::InputText || self.input_type.get() == InputType::InputPassword) { |