diff --git a/servo/components/style/gecko/conversions.rs b/servo/components/style/gecko/conversions.rs index e36ff141eaed..43438438a405 100644 --- a/servo/components/style/gecko/conversions.rs +++ b/servo/components/style/gecko/conversions.rs @@ -418,10 +418,8 @@ impl nsStyleImage { use self::structs::NS_STYLE_GRADIENT_SIZE_CLOSEST_SIDE as CLOSEST_SIDE; use self::structs::NS_STYLE_GRADIENT_SIZE_FARTHEST_CORNER as FARTHEST_CORNER; use self::structs::NS_STYLE_GRADIENT_SIZE_FARTHEST_SIDE as FARTHEST_SIDE; - use crate::values::computed::image::LineDirection; use crate::values::computed::position::Position; - use crate::values::computed::Length; - use crate::values::generics::image::{Circle, ColorStop, CompatMode, Ellipse}; + use crate::values::generics::image::{Circle, ColorStop, Ellipse}; use crate::values::generics::image::{EndingShape, GradientKind, ShapeExtent}; let gecko_gradient = bindings::Gecko_GetGradientImageValue(self) @@ -834,8 +832,7 @@ impl TrackSize { /// Return TrackSize from given two nsStyleCoord pub fn from_gecko_style_coords(gecko_min: &T, gecko_max: &T) -> Self { use crate::gecko_bindings::structs::root::nsStyleUnit; - use crate::values::computed::length::LengthPercentage; - use crate::values::generics::grid::{TrackBreadth, TrackSize}; + use crate::values::generics::grid::TrackBreadth; if gecko_min.unit() == nsStyleUnit::eStyleUnit_None { debug_assert!( @@ -862,8 +859,6 @@ impl TrackSize { /// Save TrackSize to given gecko fields. pub fn to_gecko_style_coords(&self, gecko_min: &mut T, gecko_max: &mut T) { - use crate::values::generics::grid::TrackSize; - match *self { TrackSize::FitContent(ref lop) => { // Gecko sets min value to None and max value to the actual value in fit-content @@ -893,8 +888,6 @@ impl TrackListValue { /// Save TrackSize to given gecko fields. pub fn to_gecko_style_coords(&self, gecko_min: &mut T, gecko_max: &mut T) { - use crate::values::generics::grid::TrackListValue; - match *self { TrackListValue::TrackSize(ref size) => size.to_gecko_style_coords(gecko_min, gecko_max), _ => unreachable!("Should only transform from track-size computed values"), @@ -918,8 +911,6 @@ where pub fn from_gecko_rect( sides: &crate::gecko_bindings::structs::nsStyleSides, ) -> Option> { - use crate::values::generics::rect::Rect; - Some(Rect::new( T::from_gecko_style_coord(&sides.data_at(0)).expect("coord[0] cound not convert"), T::from_gecko_style_coord(&sides.data_at(1)).expect("coord[1] cound not convert"), diff --git a/servo/components/style/gecko/values.rs b/servo/components/style/gecko/values.rs index 6b3e7a676e0a..946fa437d649 100644 --- a/servo/components/style/gecko/values.rs +++ b/servo/components/style/gecko/values.rs @@ -317,7 +317,6 @@ impl GeckoStyleCoordConvertible for ScrollSnapPoint { fn from_gecko_style_coord(coord: &T) -> Option { use crate::gecko_bindings::structs::root::nsStyleUnit; - use crate::values::generics::gecko::ScrollSnapPoint; Some(match coord.unit() { nsStyleUnit::eStyleUnit_None => ScrollSnapPoint::None, diff --git a/servo/components/style/gecko/wrapper.rs b/servo/components/style/gecko/wrapper.rs index a3c1ebeec0bb..bab4b1e2113f 100644 --- a/servo/components/style/gecko/wrapper.rs +++ b/servo/components/style/gecko/wrapper.rs @@ -986,7 +986,6 @@ fn get_animation_rule( element: &GeckoElement, cascade_level: CascadeLevel, ) -> Option>> { - use crate::gecko_bindings::sugar::ownership::HasSimpleFFI; use crate::properties::longhands::ANIMATABLE_PROPERTY_COUNT; // There's a very rough correlation between the number of effects diff --git a/servo/components/style/rule_tree/mod.rs b/servo/components/style/rule_tree/mod.rs index f165e1f455fa..3e2696fff9bb 100644 --- a/servo/components/style/rule_tree/mod.rs +++ b/servo/components/style/rule_tree/mod.rs @@ -1239,7 +1239,7 @@ impl StrongRuleNode { use crate::gecko_bindings::structs::NS_AUTHOR_SPECIFIED_BACKGROUND; use crate::gecko_bindings::structs::NS_AUTHOR_SPECIFIED_BORDER; use crate::gecko_bindings::structs::NS_AUTHOR_SPECIFIED_PADDING; - use crate::properties::{CSSWideKeyword, LonghandId, LonghandIdSet}; + use crate::properties::{CSSWideKeyword, LonghandId}; use crate::properties::{PropertyDeclaration, PropertyDeclarationId}; use crate::values::specified::Color; use std::borrow::Cow; diff --git a/servo/components/style/stylesheet_set.rs b/servo/components/style/stylesheet_set.rs index 35060a959d6c..409978c3a9ed 100644 --- a/servo/components/style/stylesheet_set.rs +++ b/servo/components/style/stylesheet_set.rs @@ -211,8 +211,6 @@ where type Item = (&'a S, SheetRebuildKind); fn next(&mut self) -> Option { - use std::mem; - loop { let potential_sheet = self.iter.next()?; diff --git a/servo/components/style/traversal.rs b/servo/components/style/traversal.rs index d5a9a5c50339..5ed2388ca5d0 100644 --- a/servo/components/style/traversal.rs +++ b/servo/components/style/traversal.rs @@ -307,8 +307,6 @@ pub fn resolve_style( where E: TElement, { - use crate::style_resolver::StyleResolverForElement; - debug_assert!( rule_inclusion == RuleInclusion::DefaultOnly || pseudo.map_or(false, |p| p.is_before_or_after()) || @@ -406,7 +404,6 @@ pub fn recalc_style_at( D: DomTraversal, F: FnMut(E::ConcreteNode), { - use crate::traversal_flags::TraversalFlags; use std::cmp; let flags = context.shared.traversal_flags; diff --git a/servo/components/style/values/generics/font.rs b/servo/components/style/values/generics/font.rs index cb1ec77e7811..36c151724903 100644 --- a/servo/components/style/values/generics/font.rs +++ b/servo/components/style/values/generics/font.rs @@ -118,7 +118,7 @@ impl ToCss for FontTag { where W: Write, { - use byteorder::{BigEndian, ByteOrder}; + use byteorder::ByteOrder; use std::str; let mut raw = [0u8; 4]; diff --git a/servo/ports/geckolib/glue.rs b/servo/ports/geckolib/glue.rs index 337fb32df7fa..f094dc2dd80a 100644 --- a/servo/ports/geckolib/glue.rs +++ b/servo/ports/geckolib/glue.rs @@ -3556,7 +3556,6 @@ fn parse_property_into( quirks_mode: QuirksMode, reporter: Option<&ParseErrorReporter>, ) -> Result<(), ()> { - use style_traits::ParsingMode; let value = unsafe { value.as_ref().unwrap().as_str_unchecked() }; let url_data = unsafe { UrlExtraData::from_ptr_ref(&data) }; let parsing_mode = ParsingMode::from_bits_truncate(parsing_mode); @@ -4306,7 +4305,7 @@ pub unsafe extern "C" fn Servo_DeclarationBlock_SetIdentStringValue( value: *mut nsAtom, ) { use style::properties::longhands::_x_lang::computed_value::T as Lang; - use style::properties::{LonghandId, PropertyDeclaration}; + use style::properties::PropertyDeclaration; let long = get_longhand_from_id!(property); let prop = match_wrap_declared! { long, @@ -4326,7 +4325,7 @@ pub extern "C" fn Servo_DeclarationBlock_SetKeywordValue( ) { use num_traits::FromPrimitive; use style::properties::longhands; - use style::properties::{LonghandId, PropertyDeclaration}; + use style::properties::PropertyDeclaration; use style::values::generics::font::FontStyle; use style::values::specified::BorderStyle; use style::values::specified::Display; @@ -4390,7 +4389,7 @@ pub extern "C" fn Servo_DeclarationBlock_SetIntValue( ) { use style::properties::longhands::_moz_script_level::SpecifiedValue as MozScriptLevel; use style::properties::longhands::_x_span::computed_value::T as Span; - use style::properties::{LonghandId, PropertyDeclaration}; + use style::properties::PropertyDeclaration; let long = get_longhand_from_id!(property); let prop = match_wrap_declared! { long, @@ -4461,7 +4460,7 @@ pub extern "C" fn Servo_DeclarationBlock_SetPixelValue( value: f32, ) { use style::properties::longhands::border_spacing::SpecifiedValue as BorderSpacing; - use style::properties::{LonghandId, PropertyDeclaration}; + use style::properties::PropertyDeclaration; use style::values::generics::length::Size; use style::values::generics::NonNegative; use style::values::generics::length::LengthPercentageOrAuto; @@ -4523,7 +4522,7 @@ pub extern "C" fn Servo_DeclarationBlock_SetLengthValue( unit: structs::nsCSSUnit, ) { use style::properties::longhands::_moz_script_min_size::SpecifiedValue as MozScriptMinSize; - use style::properties::{LonghandId, PropertyDeclaration}; + use style::properties::PropertyDeclaration; use style::values::generics::NonNegative; use style::values::generics::length::Size; use style::values::specified::length::NoCalcLength; @@ -4570,7 +4569,7 @@ pub extern "C" fn Servo_DeclarationBlock_SetNumberValue( ) { use style::properties::longhands::_moz_script_level::SpecifiedValue as MozScriptLevel; use style::properties::longhands::_moz_script_size_multiplier::SpecifiedValue as MozScriptSizeMultiplier; - use style::properties::{LonghandId, PropertyDeclaration}; + use style::properties::PropertyDeclaration; let long = get_longhand_from_id!(property); @@ -4590,7 +4589,7 @@ pub extern "C" fn Servo_DeclarationBlock_SetPercentValue( property: nsCSSPropertyID, value: f32, ) { - use style::properties::{LonghandId, PropertyDeclaration}; + use style::properties::PropertyDeclaration; use style::values::computed::Percentage; use style::values::generics::NonNegative; use style::values::generics::length::{Size, LengthPercentageOrAuto}; @@ -4620,7 +4619,7 @@ pub extern "C" fn Servo_DeclarationBlock_SetAutoValue( declarations: &RawServoDeclarationBlock, property: nsCSSPropertyID, ) { - use style::properties::{LonghandId, PropertyDeclaration}; + use style::properties::PropertyDeclaration; use style::values::generics::length::{LengthPercentageOrAuto, Size}; let long = get_longhand_from_id!(property); @@ -4644,7 +4643,7 @@ pub extern "C" fn Servo_DeclarationBlock_SetCurrentColor( declarations: &RawServoDeclarationBlock, property: nsCSSPropertyID, ) { - use style::properties::{LonghandId, PropertyDeclaration}; + use style::properties::PropertyDeclaration; use style::values::specified::Color; let long = get_longhand_from_id!(property); @@ -4669,7 +4668,7 @@ pub extern "C" fn Servo_DeclarationBlock_SetColorValue( ) { use style::gecko::values::convert_nscolor_to_rgba; use style::properties::longhands; - use style::properties::{LonghandId, PropertyDeclaration}; + use style::properties::PropertyDeclaration; use style::values::specified::Color; let long = get_longhand_from_id!(property); @@ -4694,7 +4693,6 @@ pub extern "C" fn Servo_DeclarationBlock_SetFontFamily( declarations: &RawServoDeclarationBlock, value: *const nsAString, ) { - use cssparser::{Parser, ParserInput}; use style::properties::longhands::font_family::SpecifiedValue as FontFamily; use style::properties::PropertyDeclaration; @@ -5066,8 +5064,6 @@ pub extern "C" fn Servo_GetComputedKeyframeValues( raw_data: &RawServoStyleSet, computed_keyframes: &mut nsTArray, ) { - use style::properties::LonghandIdSet; - let data = PerDocumentStyleData::from_ffi(raw_data).borrow(); let metrics = get_metrics_provider_for_product();