forked from mirrors/gecko-dev
		
	 38405ee47e
			
		
	
	
		38405ee47e
		
	
	
	
	
		
			
			This fixes about 130 clippy lints. Let me know if i should split up the commit. I wasn't sure about some of the changes, especially map_or instead of map(...).unwrap_or(...) and if let instead of single arm match were not always a strict improvement in my opinion, but i'll leave that decision to the reviewer :) There are about 150 lints left which i thought were clippy bugs or i didn't know how to fix. cc @Manishearth Source-Repo: https://github.com/servo/servo Source-Revision: 9da739acefc7d1776bf727c8bf782eb79f241028
		
			
				
	
	
		
			129 lines
		
	
	
	
		
			4.3 KiB
		
	
	
	
		
			Rust
		
	
	
	
	
	
			
		
		
	
	
			129 lines
		
	
	
	
		
			4.3 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 cssparser::RGBA;
 | |
| use dom::attr::AttrValue;
 | |
| use dom::bindings::codegen::Bindings::HTMLTableCellElementBinding::HTMLTableCellElementMethods;
 | |
| use dom::bindings::codegen::Bindings::NodeBinding::NodeMethods;
 | |
| use dom::bindings::inheritance::Castable;
 | |
| use dom::bindings::js::LayoutJS;
 | |
| use dom::document::Document;
 | |
| use dom::element::{Element, RawLayoutElementHelpers};
 | |
| use dom::htmlelement::HTMLElement;
 | |
| use dom::htmltablerowelement::HTMLTableRowElement;
 | |
| use dom::node::Node;
 | |
| use dom::virtualmethods::VirtualMethods;
 | |
| use string_cache::Atom;
 | |
| use util::str::{DOMString, LengthOrPercentageOrAuto};
 | |
| 
 | |
| const DEFAULT_COLSPAN: u32 = 1;
 | |
| 
 | |
| #[dom_struct]
 | |
| pub struct HTMLTableCellElement {
 | |
|     htmlelement: HTMLElement,
 | |
| }
 | |
| 
 | |
| impl HTMLTableCellElement {
 | |
|     pub fn new_inherited(tag_name: Atom,
 | |
|                          prefix: Option<DOMString>,
 | |
|                          document: &Document)
 | |
|                          -> HTMLTableCellElement {
 | |
|         HTMLTableCellElement {
 | |
|             htmlelement: HTMLElement::new_inherited(tag_name, prefix, document),
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     #[inline]
 | |
|     pub fn htmlelement(&self) -> &HTMLElement {
 | |
|         &self.htmlelement
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl HTMLTableCellElementMethods for HTMLTableCellElement {
 | |
|     // https://html.spec.whatwg.org/multipage/#dom-tdth-colspan
 | |
|     make_uint_getter!(ColSpan, "colspan", DEFAULT_COLSPAN);
 | |
| 
 | |
|     // https://html.spec.whatwg.org/multipage/#dom-tdth-colspan
 | |
|     make_uint_setter!(SetColSpan, "colspan", DEFAULT_COLSPAN);
 | |
| 
 | |
|     // https://html.spec.whatwg.org/multipage/#dom-tdth-bgcolor
 | |
|     make_getter!(BgColor, "bgcolor");
 | |
| 
 | |
|     // https://html.spec.whatwg.org/multipage/#dom-tdth-bgcolor
 | |
|     make_legacy_color_setter!(SetBgColor, "bgcolor");
 | |
| 
 | |
|     // https://html.spec.whatwg.org/multipage/#dom-tdth-width
 | |
|     make_getter!(Width, "width");
 | |
| 
 | |
|     // https://html.spec.whatwg.org/multipage/#dom-tdth-width
 | |
|     make_nonzero_dimension_setter!(SetWidth, "width");
 | |
| 
 | |
|     // https://html.spec.whatwg.org/multipage/#dom-tdth-cellindex
 | |
|     fn CellIndex(&self) -> i32 {
 | |
|         let self_node = self.upcast::<Node>();
 | |
| 
 | |
|         let parent_children = match self_node.GetParentNode() {
 | |
|             Some(ref parent_node) if parent_node.is::<HTMLTableRowElement>() => {
 | |
|                 parent_node.children()
 | |
|             },
 | |
|             _ => return -1,
 | |
|         };
 | |
| 
 | |
|         parent_children.filter(|c| c.is::<HTMLTableCellElement>())
 | |
|                        .position(|c| c.r() == self_node)
 | |
|                        .map_or(-1, |p| p as i32)
 | |
|     }
 | |
| }
 | |
| 
 | |
| 
 | |
| pub trait HTMLTableCellElementLayoutHelpers {
 | |
|     fn get_background_color(&self) -> Option<RGBA>;
 | |
|     fn get_colspan(&self) -> Option<u32>;
 | |
|     fn get_width(&self) -> LengthOrPercentageOrAuto;
 | |
| }
 | |
| 
 | |
| #[allow(unsafe_code)]
 | |
| impl HTMLTableCellElementLayoutHelpers for LayoutJS<HTMLTableCellElement> {
 | |
|     fn get_background_color(&self) -> Option<RGBA> {
 | |
|         unsafe {
 | |
|             (&*self.upcast::<Element>().unsafe_get())
 | |
|                 .get_attr_for_layout(&ns!(), &atom!("bgcolor"))
 | |
|                 .and_then(AttrValue::as_color)
 | |
|                 .cloned()
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     fn get_colspan(&self) -> Option<u32> {
 | |
|         unsafe {
 | |
|             (&*self.upcast::<Element>().unsafe_get())
 | |
|                 .get_attr_for_layout(&ns!(), &atom!("colspan"))
 | |
|                 .map(AttrValue::as_uint)
 | |
|         }
 | |
|     }
 | |
| 
 | |
|     fn get_width(&self) -> LengthOrPercentageOrAuto {
 | |
|         unsafe {
 | |
|             (&*self.upcast::<Element>().unsafe_get())
 | |
|                 .get_attr_for_layout(&ns!(), &atom!("width"))
 | |
|                 .map(AttrValue::as_dimension)
 | |
|                 .cloned()
 | |
|                 .unwrap_or(LengthOrPercentageOrAuto::Auto)
 | |
|         }
 | |
|     }
 | |
| }
 | |
| 
 | |
| impl VirtualMethods for HTMLTableCellElement {
 | |
|     fn super_type(&self) -> Option<&VirtualMethods> {
 | |
|         Some(self.upcast::<HTMLElement>() as &VirtualMethods)
 | |
|     }
 | |
| 
 | |
|     fn parse_plain_attribute(&self, local_name: &Atom, value: DOMString) -> AttrValue {
 | |
|         match *local_name {
 | |
|             atom!("colspan") => AttrValue::from_u32(value, DEFAULT_COLSPAN),
 | |
|             atom!("bgcolor") => AttrValue::from_legacy_color(value),
 | |
|             atom!("width") => AttrValue::from_nonzero_dimension(value),
 | |
|             _ => self.super_type().unwrap().parse_plain_attribute(local_name, value),
 | |
|         }
 | |
|     }
 | |
| }
 |