Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-24 15:50:21 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix tidy

Browse source
This commit is contained in:
Manish Goregaokar 2016-08-02 11:16:50 +05:30
parent eb82cc25ef
commit 1e7973263f
No known key found for this signature in database
GPG key ID: 3BBF4D3E2EF79F98
4 changed files with 17 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/style/values/computed/basic_shape.rs
View file

@ -7,10 +7,10 @@
//! //!
//! [basic-shape]: https://drafts.csswg.org/css-shapes/#typedef-basic-shape //! [basic-shape]: https://drafts.csswg.org/css-shapes/#typedef-basic-shape
use values::computed::{BorderRadiusSize, LengthOrPercentage};
use values::computed::position::Position;
use std::fmt;
use cssparser::ToCss; use cssparser::ToCss;
use std::fmt;
use values::computed::position::Position;
use values::computed::{BorderRadiusSize, LengthOrPercentage};
#[derive(Clone, PartialEq, Debug)] #[derive(Clone, PartialEq, Debug)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
@ -86,8 +86,8 @@ pub struct Ellipse {
impl ToCss for Ellipse { impl ToCss for Ellipse {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
if ShapeRadius::ClosestSide != self.semiaxis_a if ShapeRadius::ClosestSide != self.semiaxis_a &&
&& ShapeRadius::ClosestSide != self.semiaxis_b { ShapeRadius::ClosestSide != self.semiaxis_b {
try!(self.semiaxis_a.to_css(dest)); try!(self.semiaxis_a.to_css(dest));
try!(dest.write_str(" ")); try!(dest.write_str(" "));
try!(self.semiaxis_b.to_css(dest)); try!(self.semiaxis_b.to_css(dest));

2
components/style/values/computed/position.rs
View file

@ -8,8 +8,8 @@
//! [position]: https://drafts.csswg.org/css-backgrounds-3/#position //! [position]: https://drafts.csswg.org/css-backgrounds-3/#position
use cssparser::ToCss; use cssparser::ToCss;
use values::computed::LengthOrPercentage;
use std::fmt; use std::fmt;
use values::computed::LengthOrPercentage;
#[derive(Debug, Clone, PartialEq, Copy)] #[derive(Debug, Clone, PartialEq, Copy)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]

14
components/style/values/specified/basic_shape.rs
View file

@ -8,13 +8,13 @@
//! [basic-shape]: https://drafts.csswg.org/css-shapes/#typedef-basic-shape //! [basic-shape]: https://drafts.csswg.org/css-shapes/#typedef-basic-shape
use app_units::Au; use app_units::Au;
use std::fmt;
use cssparser::{Parser, ToCss}; use cssparser::{Parser, ToCss};
use properties::shorthands::parse_four_sides; use properties::shorthands::parse_four_sides;
use values::specified::{BorderRadiusSize, Length, LengthOrPercentage}; use std::fmt;
use values::specified::position::{Position, PositionComponent};
use values::computed::{Context, ToComputedValue, ComputedValueAsSpecified};
use values::computed::basic_shape as computed_basic_shape; use values::computed::basic_shape as computed_basic_shape;
use values::computed::{Context, ToComputedValue, ComputedValueAsSpecified};
use values::specified::position::{Position, PositionComponent};
use values::specified::{BorderRadiusSize, Length, LengthOrPercentage};
#[derive(Clone, PartialEq, Debug)] #[derive(Clone, PartialEq, Debug)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
@ -87,7 +87,7 @@ impl InsetRect {
} }
} }
pub fn parse_function(input: &mut Parser) -> Result<InsetRect, ()> { pub fn parse_function(input: &mut Parser) -> Result<InsetRect, ()> {
let (t,r,b,l) = try!(parse_four_sides(input, LengthOrPercentage::parse)); let (t, r, b, l) = try!(parse_four_sides(input, LengthOrPercentage::parse));
let mut rect = InsetRect { let mut rect = InsetRect {
top: t, top: t,
right: r, right: r,
@ -230,8 +230,8 @@ impl Ellipse {
impl ToCss for Ellipse { impl ToCss for Ellipse {
fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write { fn to_css<W>(&self, dest: &mut W) -> fmt::Result where W: fmt::Write {
if ShapeRadius::ClosestSide != self.semiaxis_a if ShapeRadius::ClosestSide != self.semiaxis_a &&
&& ShapeRadius::ClosestSide != self.semiaxis_b { ShapeRadius::ClosestSide != self.semiaxis_b {
try!(self.semiaxis_a.to_css(dest)); try!(self.semiaxis_a.to_css(dest));
try!(dest.write_str(" ")); try!(dest.write_str(" "));
try!(self.semiaxis_b.to_css(dest)); try!(self.semiaxis_b.to_css(dest));

9
components/style/values/specified/position.rs
View file

@ -7,13 +7,12 @@
//! //!
//! [position]: https://drafts.csswg.org/css-backgrounds-3/#position //! [position]: https://drafts.csswg.org/css-backgrounds-3/#position
use std::fmt;
use cssparser::{Parser, ToCss, Token}; use cssparser::{Parser, ToCss, Token};
use std::fmt;
use values::HasViewportPercentage; use values::HasViewportPercentage;
use values::specified::{LengthOrPercentage, Percentage};
use values::computed::{Context, ToComputedValue};
use values::computed::position as computed_position; use values::computed::position as computed_position;
use values::computed::{Context, ToComputedValue};
use values::specified::{LengthOrPercentage, Percentage};
#[derive(Debug, Clone, PartialEq, Copy)] #[derive(Debug, Clone, PartialEq, Copy)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]
@ -152,4 +151,4 @@ impl PositionComponent {
PositionComponent::Bottom => LengthOrPercentage::Percentage(Percentage(1.0)), PositionComponent::Bottom => LengthOrPercentage::Percentage(Percentage(1.0)),
} }
} }
} }