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

Appease tidy.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2018-08-18 18:41:40 +02:00
parent 935b5393a9
commit 38a00745e2
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
4 changed files with 27 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/style/media_queries/media_feature.rs
View file

@ -4,14 +4,13 @@
//! Media features.
use super::Device;
use super::media_feature_expression::{AspectRatio, RangeOrOperator};
use Atom;
use cssparser::Parser;
use parser::ParserContext;
use std::fmt;
use style_traits::ParseError;
use super::Device;
use super::media_feature_expression::{AspectRatio, RangeOrOperator};
use values::computed::{CSSPixelLength, Resolution};
/// A generic discriminant for an enum value.
@ -132,7 +131,7 @@ bitflags! {
}
/// Whether a media feature allows ranges or not.
#[derive(Copy, Clone, Debug, PartialEq, Eq)]
#[derive(Clone, Copy, Debug, Eq, PartialEq)]
#[allow(missing_docs)]
pub enum AllowsRanges {
Yes,

26
components/style/media_queries/media_feature_expression.rs
View file

@ -5,13 +5,11 @@
//! Parsing for media feature expressions, like `(foo: bar)` or
//! `(width >= 400px)`.
use super::Device;
use super::media_feature::{Evaluator, MediaFeatureDescription};
use super::media_feature::{ParsingRequirements, KeywordDiscriminant};
use Atom;
use cssparser::{Parser, Token};
use context::QuirksMode;
use cssparser::{Parser, Token};
#[cfg(feature = "gecko")]
use gecko_bindings::structs;
use num_traits::Zero;
use parser::{Parse, ParserContext};
use std::cmp::{PartialOrd, Ordering};
@ -19,17 +17,12 @@ use std::fmt::{self, Write};
use str::{starts_with_ignore_ascii_case, string_as_ascii_lowercase};
use style_traits::{CssWriter, ParseError, StyleParseErrorKind, ToCss};
use stylesheets::Origin;
use super::Device;
use super::media_feature::{Evaluator, MediaFeatureDescription};
use super::media_feature::{ParsingRequirements, KeywordDiscriminant};
use values::{serialize_atom_identifier, CSSFloat};
use values::specified::{Integer, Length, Number, Resolution};
use values::computed::{self, ToComputedValue};
#[cfg(feature = "gecko")]
use gecko_bindings::structs;
#[cfg(feature = "gecko")]
use gecko::media_features::MEDIA_FEATURES;
#[cfg(feature = "servo")]
use servo::media_queries::MEDIA_FEATURES;
use values::specified::{Integer, Length, Number, Resolution};
/// An aspect ratio, with a numerator and denominator.
#[derive(Clone, Copy, Debug, Eq, MallocSizeOf, PartialEq)]
@ -287,6 +280,11 @@ impl MediaFeatureExpression {
context: &ParserContext,
input: &mut Parser<'i, 't>,
) -> Result<Self, ParseError<'i>> {
#[cfg(feature = "gecko")]
use gecko::media_features::MEDIA_FEATURES;
#[cfg(feature = "servo")]
use servo::media_queries::MEDIA_FEATURES;
// FIXME: remove extra indented block when lifetimes are non-lexical
let feature;
let range;