mirror of
https://github.com/servo/servo.git
synced 2025-08-03 20:50:07 +01:00
Update rustfmt to the 2024 style edition (#35764)
* Use 2024 style edition Signed-off-by: Simon Wülker <simon.wuelker@arcor.de> * Reformat all code Signed-off-by: Simon Wülker <simon.wuelker@arcor.de> --------- Signed-off-by: Simon Wülker <simon.wuelker@arcor.de>
This commit is contained in:
parent
6300e820b4
commit
3d320fa96a
603 changed files with 1739 additions and 1648 deletions
|
@ -7,15 +7,16 @@ use std::convert::TryFrom;
|
|||
|
||||
use rayon::iter::{IntoParallelIterator, ParallelIterator};
|
||||
use servo_arc::Arc;
|
||||
use style::properties::longhands::list_style_position::computed_value::T as ListStylePosition;
|
||||
use style::properties::ComputedValues;
|
||||
use style::properties::longhands::list_style_position::computed_value::T as ListStylePosition;
|
||||
use style::selector_parser::PseudoElement;
|
||||
use style::str::char_is_whitespace;
|
||||
|
||||
use super::OutsideMarker;
|
||||
use super::inline::InlineFormattingContext;
|
||||
use super::inline::construct::InlineFormattingContextBuilder;
|
||||
use super::inline::inline_box::InlineBox;
|
||||
use super::inline::InlineFormattingContext;
|
||||
use super::OutsideMarker;
|
||||
use crate::PropagatedBoxTreeData;
|
||||
use crate::cell::ArcRefCell;
|
||||
use crate::context::LayoutContext;
|
||||
use crate::dom::{BoxSlot, LayoutBox, NodeExt};
|
||||
|
@ -30,7 +31,6 @@ use crate::layout_box_base::LayoutBoxBase;
|
|||
use crate::positioned::AbsolutelyPositionedBox;
|
||||
use crate::style_ext::{ComputedValuesExt, DisplayGeneratingBox, DisplayInside, DisplayOutside};
|
||||
use crate::table::{AnonymousTableContent, Table};
|
||||
use crate::PropagatedBoxTreeData;
|
||||
|
||||
impl BlockFormattingContext {
|
||||
pub(crate) fn construct<'dom, Node>(
|
||||
|
@ -204,9 +204,11 @@ where
|
|||
}
|
||||
|
||||
pub(crate) fn finish(mut self) -> BlockContainer {
|
||||
debug_assert!(!self
|
||||
.inline_formatting_context_builder
|
||||
.currently_processing_inline_box());
|
||||
debug_assert!(
|
||||
!self
|
||||
.inline_formatting_context_builder
|
||||
.currently_processing_inline_box()
|
||||
);
|
||||
|
||||
self.finish_anonymous_table_if_needed();
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ use crate::dom_traversal::{Contents, NodeAndStyleInfo};
|
|||
use crate::formatting_contexts::IndependentFormattingContext;
|
||||
use crate::fragment_tree::{BoxFragment, CollapsedMargin};
|
||||
use crate::geom::{LogicalRect, LogicalVec2, ToLogical};
|
||||
use crate::positioned::{relative_adjustement, PositioningContext};
|
||||
use crate::positioned::{PositioningContext, relative_adjustement};
|
||||
use crate::style_ext::{DisplayInside, PaddingBorderMargin};
|
||||
use crate::{ContainingBlock, PropagatedBoxTreeData};
|
||||
|
||||
|
|
|
@ -13,6 +13,7 @@ use unicode_bidi::Level;
|
|||
|
||||
use super::text_run::TextRun;
|
||||
use super::{InlineBox, InlineBoxIdentifier, InlineBoxes, InlineFormattingContext, InlineItem};
|
||||
use crate::PropagatedBoxTreeData;
|
||||
use crate::cell::ArcRefCell;
|
||||
use crate::context::LayoutContext;
|
||||
use crate::dom::NodeExt;
|
||||
|
@ -21,7 +22,6 @@ use crate::flow::float::FloatBox;
|
|||
use crate::formatting_contexts::IndependentFormattingContext;
|
||||
use crate::positioned::AbsolutelyPositionedBox;
|
||||
use crate::style_ext::ComputedValuesExt;
|
||||
use crate::PropagatedBoxTreeData;
|
||||
|
||||
#[derive(Default)]
|
||||
pub(crate) struct InlineFormattingContextBuilder {
|
||||
|
|
|
@ -9,14 +9,14 @@ use fonts::FontMetrics;
|
|||
use servo_arc::Arc;
|
||||
use style::properties::ComputedValues;
|
||||
|
||||
use super::{inline_container_needs_strut, InlineContainerState, InlineContainerStateFlags};
|
||||
use super::{InlineContainerState, InlineContainerStateFlags, inline_container_needs_strut};
|
||||
use crate::ContainingBlock;
|
||||
use crate::cell::ArcRefCell;
|
||||
use crate::context::LayoutContext;
|
||||
use crate::dom::NodeExt;
|
||||
use crate::dom_traversal::NodeAndStyleInfo;
|
||||
use crate::fragment_tree::BaseFragmentInfo;
|
||||
use crate::style_ext::{LayoutStyle, PaddingBorderMargin};
|
||||
use crate::ContainingBlock;
|
||||
|
||||
#[derive(Debug)]
|
||||
pub(crate) struct InlineBox {
|
||||
|
|
|
@ -7,6 +7,7 @@ use bitflags::bitflags;
|
|||
use fonts::{FontMetrics, GlyphStore};
|
||||
use itertools::Either;
|
||||
use servo_arc::Arc;
|
||||
use style::Zero;
|
||||
use style::computed_values::position::T as Position;
|
||||
use style::computed_values::white_space_collapse::T as WhiteSpaceCollapse;
|
||||
use style::properties::ComputedValues;
|
||||
|
@ -15,7 +16,6 @@ use style::values::generics::font::LineHeight;
|
|||
use style::values::specified::align::AlignFlags;
|
||||
use style::values::specified::box_::DisplayOutside;
|
||||
use style::values::specified::text::TextDecorationLine;
|
||||
use style::Zero;
|
||||
use unicode_bidi::{BidiInfo, Level};
|
||||
use webrender_api::FontInstanceKey;
|
||||
|
||||
|
@ -27,7 +27,7 @@ use crate::fragment_tree::{
|
|||
};
|
||||
use crate::geom::{LogicalRect, LogicalVec2, PhysicalRect, ToLogical};
|
||||
use crate::positioned::{
|
||||
relative_adjustement, AbsolutelyPositionedBox, PositioningContext, PositioningContextLength,
|
||||
AbsolutelyPositionedBox, PositioningContext, PositioningContextLength, relative_adjustement,
|
||||
};
|
||||
use crate::{ContainingBlock, ContainingBlockSize};
|
||||
|
||||
|
|
|
@ -89,28 +89,28 @@ use line::{
|
|||
};
|
||||
use line_breaker::LineBreaker;
|
||||
use servo_arc::Arc;
|
||||
use style::Zero;
|
||||
use style::computed_values::text_wrap_mode::T as TextWrapMode;
|
||||
use style::computed_values::vertical_align::T as VerticalAlign;
|
||||
use style::computed_values::white_space_collapse::T as WhiteSpaceCollapse;
|
||||
use style::context::QuirksMode;
|
||||
use style::properties::style_structs::InheritedText;
|
||||
use style::properties::ComputedValues;
|
||||
use style::properties::style_structs::InheritedText;
|
||||
use style::values::generics::box_::VerticalAlignKeyword;
|
||||
use style::values::generics::font::LineHeight;
|
||||
use style::values::specified::box_::BaselineSource;
|
||||
use style::values::specified::text::{TextAlignKeyword, TextDecorationLine};
|
||||
use style::values::specified::{TextAlignLast, TextJustify};
|
||||
use style::Zero;
|
||||
use text_run::{
|
||||
add_or_get_font, get_font_for_first_font_for_style, TextRun, XI_LINE_BREAKING_CLASS_GL,
|
||||
XI_LINE_BREAKING_CLASS_WJ, XI_LINE_BREAKING_CLASS_ZWJ,
|
||||
TextRun, XI_LINE_BREAKING_CLASS_GL, XI_LINE_BREAKING_CLASS_WJ, XI_LINE_BREAKING_CLASS_ZWJ,
|
||||
add_or_get_font, get_font_for_first_font_for_style,
|
||||
};
|
||||
use unicode_bidi::{BidiInfo, Level};
|
||||
use webrender_api::FontInstanceKey;
|
||||
use xi_unicode::linebreak_property;
|
||||
|
||||
use super::float::{Clear, PlacementAmongFloats};
|
||||
use super::IndependentFormattingContextContents;
|
||||
use super::float::{Clear, PlacementAmongFloats};
|
||||
use crate::cell::ArcRefCell;
|
||||
use crate::context::LayoutContext;
|
||||
use crate::flow::float::{FloatBox, SequentialLayoutState};
|
||||
|
|
|
@ -8,7 +8,7 @@ use std::ops::Range;
|
|||
use app_units::Au;
|
||||
use base::text::is_bidi_control;
|
||||
use fonts::{
|
||||
FontContext, FontRef, GlyphRun, ShapingFlags, ShapingOptions, LAST_RESORT_GLYPH_ADVANCE,
|
||||
FontContext, FontRef, GlyphRun, LAST_RESORT_GLYPH_ADVANCE, ShapingFlags, ShapingOptions,
|
||||
};
|
||||
use fonts_traits::ByteIndex;
|
||||
use log::warn;
|
||||
|
|
|
@ -9,6 +9,7 @@ use app_units::{Au, MAX_AU};
|
|||
use inline::InlineFormattingContext;
|
||||
use rayon::iter::{IntoParallelRefIterator, ParallelIterator};
|
||||
use servo_arc::Arc;
|
||||
use style::Zero;
|
||||
use style::computed_values::clear::T as StyleClear;
|
||||
use style::logical_geometry::Direction;
|
||||
use style::properties::ComputedValues;
|
||||
|
@ -16,7 +17,6 @@ use style::servo::selector_parser::PseudoElement;
|
|||
use style::values::computed::Size as StyleSize;
|
||||
use style::values::specified::align::AlignFlags;
|
||||
use style::values::specified::{Display, TextAlignKeyword};
|
||||
use style::Zero;
|
||||
|
||||
use crate::cell::ArcRefCell;
|
||||
use crate::context::LayoutContext;
|
||||
|
@ -815,10 +815,10 @@ impl BlockLevelBox {
|
|||
BlockLevelBox::OutOfFlowAbsolutelyPositionedBox(box_) => &box_.borrow().context,
|
||||
BlockLevelBox::OutOfFlowFloatBox(float_box) => &float_box.contents,
|
||||
BlockLevelBox::OutsideMarker(outside_marker) => {
|
||||
return outside_marker.inline_content_sizes(layout_context, constraint_space)
|
||||
return outside_marker.inline_content_sizes(layout_context, constraint_space);
|
||||
},
|
||||
BlockLevelBox::SameFormattingContextBlock { base, contents, .. } => {
|
||||
return base.inline_content_sizes(layout_context, constraint_space, contents)
|
||||
return base.inline_content_sizes(layout_context, constraint_space, contents);
|
||||
},
|
||||
};
|
||||
independent_formatting_context.inline_content_sizes(layout_context, constraint_space)
|
||||
|
|
|
@ -18,7 +18,7 @@ use webrender_traits::display_list::AxesScrollSensitivity;
|
|||
use crate::cell::ArcRefCell;
|
||||
use crate::context::LayoutContext;
|
||||
use crate::dom::{LayoutBox, NodeExt};
|
||||
use crate::dom_traversal::{iter_child_nodes, Contents, NodeAndStyleInfo, NonReplacedContents};
|
||||
use crate::dom_traversal::{Contents, NodeAndStyleInfo, NonReplacedContents, iter_child_nodes};
|
||||
use crate::flexbox::FlexLevelBox;
|
||||
use crate::flow::float::FloatBox;
|
||||
use crate::flow::inline::InlineItem;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue