diff options
author | Simon Sapin <simon.sapin@exyr.org> | 2018-11-01 14:09:54 +0100 |
---|---|---|
committer | Simon Sapin <simon.sapin@exyr.org> | 2018-11-10 17:47:28 +0100 |
commit | a15d33a10e8a0aa1c02fa44ede50a63b95606b8f (patch) | |
tree | 5b0ef37530e77e646c2b6bc7df3d95e756607e77 /components/style/values/generics/svg.rs | |
parent | e1fcffb336d763d851f14fae5cda464209552bb2 (diff) | |
download | servo-a15d33a10e8a0aa1c02fa44ede50a63b95606b8f.tar.gz servo-a15d33a10e8a0aa1c02fa44ede50a63b95606b8f.zip |
`cargo fix --edition`
Diffstat (limited to 'components/style/values/generics/svg.rs')
-rw-r--r-- | components/style/values/generics/svg.rs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/components/style/values/generics/svg.rs b/components/style/values/generics/svg.rs index 2dd81da5eda..cdbca333441 100644 --- a/components/style/values/generics/svg.rs +++ b/components/style/values/generics/svg.rs @@ -4,10 +4,10 @@ //! Generic types for CSS values in SVG +use crate::parser::{Parse, ParserContext}; +use crate::values::{Either, None_}; use cssparser::Parser; -use parser::{Parse, ParserContext}; use style_traits::{ParseError, StyleParseErrorKind}; -use values::{Either, None_}; /// An SVG paint value /// @@ -84,10 +84,10 @@ fn parse_fallback<'i, 't, ColorType: Parse>( context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Option<Either<ColorType, None_>> { - if input.try(|i| i.expect_ident_matching("none")).is_ok() { + if input.r#try(|i| i.expect_ident_matching("none")).is_ok() { Some(Either::Second(None_)) } else { - if let Ok(color) = input.try(|i| ColorType::parse(context, i)) { + if let Ok(color) = input.r#try(|i| ColorType::parse(context, i)) { Some(Either::First(color)) } else { None @@ -100,12 +100,12 @@ impl<ColorType: Parse, UrlPaintServer: Parse> Parse for SVGPaint<ColorType, UrlP context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result<Self, ParseError<'i>> { - if let Ok(url) = input.try(|i| UrlPaintServer::parse(context, i)) { + if let Ok(url) = input.r#try(|i| UrlPaintServer::parse(context, i)) { Ok(SVGPaint { kind: SVGPaintKind::PaintServer(url), fallback: parse_fallback(context, input), }) - } else if let Ok(kind) = input.try(SVGPaintKind::parse_ident) { + } else if let Ok(kind) = input.r#try(SVGPaintKind::parse_ident) { if let SVGPaintKind::None = kind { Ok(SVGPaint { kind: kind, @@ -117,7 +117,7 @@ impl<ColorType: Parse, UrlPaintServer: Parse> Parse for SVGPaint<ColorType, UrlP fallback: parse_fallback(context, input), }) } - } else if let Ok(color) = input.try(|i| ColorType::parse(context, i)) { + } else if let Ok(color) = input.r#try(|i| ColorType::parse(context, i)) { Ok(SVGPaint { kind: SVGPaintKind::Color(color), fallback: None, @@ -158,7 +158,7 @@ impl<LengthOrPercentageType: Parse, NumberType: Parse> Parse context: &ParserContext, input: &mut Parser<'i, 't>, ) -> Result<Self, ParseError<'i>> { - if let Ok(num) = input.try(|i| NumberType::parse(context, i)) { + if let Ok(num) = input.r#try(|i| NumberType::parse(context, i)) { return Ok(SvgLengthOrPercentageOrNumber::Number(num)); } |