Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

style: Sync changes from mozilla-central. #22143

Merged
merged 11 commits into from Nov 8, 2018

style: Format recent patches.

  • Loading branch information
emilio committed Nov 8, 2018
commit 175e594652b3c9d41052c46dd8d73eea55f5b2c4
@@ -217,7 +217,9 @@ impl<T> structs::RefPtr<T> {
where
U: HasArcFFI<FFIType = T>,
{
unsafe { U::release_opt(self.mRawPtr.as_ref()); }
unsafe {
U::release_opt(self.mRawPtr.as_ref());
}
self.set_arc_leaky(other);
}

@@ -17,7 +17,7 @@ use values::generics::length::{MaxLength as GenericMaxLength, MozLength as Gener
use values::generics::NonNegative;
use values::specified::length::ViewportPercentageLength;
use values::specified::length::{AbsoluteLength, FontBaseSize, FontRelativeLength};
use values::{specified, Auto, CSSFloat, Either, Normal, IsAuto};
use values::{specified, Auto, CSSFloat, Either, IsAuto, Normal};

pub use super::image::Image;
pub use values::specified::url::UrlOrNone;
@@ -21,7 +21,8 @@ lazy_static! {
opening: "\u{2018}".to_owned().into_boxed_str(),
closing: "\u{2019}".to_owned().into_boxed_str(),
},
].into_boxed_slice()
]
.into_boxed_slice()
);
}

@@ -367,9 +367,7 @@ impl Scale {
pub fn to_transform_operation(&self) -> Option<TransformOperation> {
match *self {
generic::Scale::None => None,
generic::Scale::Scale(sx, sy) => {
Some(generic::TransformOperation::Scale(sx, Some(sy)))
},
generic::Scale::Scale(sx, sy) => Some(generic::TransformOperation::Scale(sx, Some(sy))),
generic::Scale::Scale3D(sx, sy, sz) => {
Some(generic::TransformOperation::Scale3D(sx, sy, sz))
},
@@ -57,7 +57,7 @@ where
height.to_css(dest)?;
}
Ok(())
}
},
BackgroundSize::Cover => dest.write_str("cover"),
BackgroundSize::Contain => dest.write_str("contain"),
}
@@ -20,7 +20,7 @@ use values::computed::{self, CSSPixelLength, Context, ExtremumLength};
use values::generics::length::{MaxLength as GenericMaxLength, MozLength as GenericMozLength};
use values::generics::NonNegative;
use values::specified::calc::CalcNode;
use values::{Auto, CSSFloat, Either, Normal, IsAuto};
use values::{Auto, CSSFloat, Either, IsAuto, Normal};

pub use super::image::{ColorStop, EndingShape as GradientEndingShape, Gradient};
pub use super::image::{GradientKind, Image};
@@ -88,7 +88,7 @@ pub struct QuotePair {
pub struct Quotes(
#[css(iterable, if_empty = "none")]
#[ignore_malloc_size_of = "Arc"]
pub Arc<Box<[QuotePair]>>
pub Arc<Box<[QuotePair]>>,
);

impl Parse for Quotes {
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.