style: Remove glob imports added in #4405

components/layout/css/matching.rs

@@ -559,10 +559,10 @@ impl<'ln> MatchMethods for LayoutNode<'ln> {
 
 
     // In terms of `SimpleSelector`s, these two functions will insert and remove:
-    //   - `LocalNameSelector`
-    //   - `NamepaceSelector`
-    //   - `IDSelector`
-    //   - `ClassSelector`
+    //   - `SimpleSelector::LocalName`
+    //   - `SimpleSelector::Namepace`
+    //   - `SimpleSelector::ID`
+    //   - `SimpleSelector::Class`
 
     fn insert_into_bloom_filter(&self, bf: &mut BloomFilter) {
         // Only elements are interesting.

components/layout/table_cell.rs

@@ -39,7 +39,7 @@ impl TableCellFlow {
                                                   -> TableCellFlow {
         TableCellFlow {
             block_flow: BlockFlow::from_node_and_fragment(node, fragment),
-            column_span: node.get_unsigned_integer_attribute(UnsignedIntegerAttribute::ColSpanUnsignedIntegerAttribute)
+            column_span: node.get_unsigned_integer_attribute(UnsignedIntegerAttribute::ColSpan)
                              .unwrap_or(1),
             visible: visible,
         }

components/layout/wrapper.rs

@@ -594,7 +594,7 @@ impl<'le> TElement<'le> for LayoutElement<'le> {
     fn has_nonzero_border(self) -> bool {
         unsafe {
             match self.element
-                      .get_unsigned_integer_attribute_for_layout(UnsignedIntegerAttribute::BorderUnsignedIntegerAttribute) {
+                      .get_unsigned_integer_attribute_for_layout(UnsignedIntegerAttribute::Border) {
                 None | Some(0) => false,
                 _ => true,
             }