parser: Remove ParserInput.

color/lib.rs

@@ -44,7 +44,7 @@ where
 /// value on success.
 pub fn parse_color_with<'i, P>(
     color_parser: &P,
-    input: &mut Parser<'i, '_>,
+    input: &mut Parser<'i>,
 ) -> Result<P::Output, ParseError<P::Error>>
 where
     P: ColorParser<'i>,
@@ -112,7 +112,7 @@ where
 /// Parse the alpha component by itself from either number or percentage,
 /// clipping the result to [0.0..1.0].
 #[inline]
-fn parse_alpha_component<'i, 't, P>(
+fn parse_alpha_component<'i, P>(
     color_parser: &P,
     arguments: &mut Parser,
 ) -> Result<f32, ParseError<P::Error>>
@@ -125,7 +125,7 @@ where
         .clamp(0.0, OPAQUE))
 }
 
-fn parse_legacy_alpha<'i, 't, P>(
+fn parse_legacy_alpha<'i, P>(
     color_parser: &P,
     arguments: &mut Parser,
 ) -> Result<f32, ParseError<P::Error>>
@@ -140,7 +140,7 @@ where
     })
 }
 
-fn parse_modern_alpha<'i, 't, P>(
+fn parse_modern_alpha<'i, P>(
     color_parser: &P,
     arguments: &mut Parser,
 ) -> Result<Option<f32>, ParseError<P::Error>>
@@ -156,7 +156,7 @@ where
 }
 
 #[inline]
-fn parse_rgb<'i, 't, P>(
+fn parse_rgb<'i, P>(
     color_parser: &P,
     arguments: &mut Parser,
 ) -> Result<P::Output, ParseError<P::Error>>
@@ -222,7 +222,7 @@ where
 ///
 /// <https://drafts.csswg.org/css-color/#the-hsl-notation>
 #[inline]
-fn parse_hsl<'i, 't, P>(
+fn parse_hsl<'i, P>(
     color_parser: &P,
     arguments: &mut Parser,
 ) -> Result<P::Output, ParseError<P::Error>>
@@ -261,7 +261,7 @@ where
 ///
 /// <https://drafts.csswg.org/css-color/#the-hbw-notation>
 #[inline]
-fn parse_hwb<'i, 't, P>(
+fn parse_hwb<'i, P>(
     color_parser: &P,
     arguments: &mut Parser,
 ) -> Result<P::Output, ParseError<P::Error>>
@@ -340,7 +340,7 @@ type IntoColorFn<Output> =
     fn(l: Option<f32>, a: Option<f32>, b: Option<f32>, alpha: Option<f32>) -> Output;
 
 #[inline]
-fn parse_lab_like<'i, 't, P>(
+fn parse_lab_like<'i, P>(
     color_parser: &P,
     arguments: &mut Parser,
     lightness_range: f32,
@@ -366,7 +366,7 @@ where
 }
 
 #[inline]
-fn parse_lch_like<'i, 't, P>(
+fn parse_lch_like<'i, P>(
     color_parser: &P,
     arguments: &mut Parser,
     lightness_range: f32,
@@ -393,7 +393,7 @@ where
 
 /// Parse the color() function.
 #[inline]
-fn parse_color_with_color_space<'i, 't, P>(
+fn parse_color_with_color_space<'i, P>(
     color_parser: &P,
     arguments: &mut Parser,
 ) -> Result<P::Output, ParseError<P::Error>>
@@ -427,7 +427,7 @@ type ComponentParseResult<R1, R2, R3, Error> =
     Result<(Option<R1>, Option<R2>, Option<R3>, Option<f32>), ParseError<Error>>;
 
 /// Parse the color components and alpha with the modern [color-4] syntax.
-pub fn parse_components<'i, 't, P, F1, F2, F3, R1, R2, R3>(
+pub fn parse_components<'i, P, F1, F2, F3, R1, R2, R3>(
     color_parser: &P,
     input: &mut Parser,
     f1: F1,

color/tests.rs

@@ -3,7 +3,6 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 use super::*;
-use cssparser::ParserInput;
 use serde_json::{json, Value};
 
 fn almost_equals(a: &Value, b: &Value) -> bool {
@@ -60,8 +59,7 @@ fn run_raw_json_tests<F: Fn(Value, Value)>(json_data: &str, run: F) {
 fn run_json_tests<F: Fn(&mut Parser) -> Value>(json_data: &str, parse: F) {
     run_raw_json_tests(json_data, |input, expected| match input {
         Value::String(input) => {
-            let mut parse_input = ParserInput::new(&input);
-            let result = parse(&mut Parser::new(&mut parse_input));
+            let result = parse(&mut Parser::new(&input));
             assert_json_eq(result, expected, &input);
         }
         _ => panic!("Unexpected JSON"),
@@ -149,9 +147,7 @@ fn color4_color_function() {
 
 macro_rules! parse_single_color {
     ($i:expr) => {{
-        let input = $i;
-        let mut input = ParserInput::new(input);
-        let mut input = Parser::new(&mut input);
+        let mut input = Parser::new($i);
         Color::parse(&mut input).map_err(Into::<ParseError<()>>::into)
     }};
 }
@@ -355,8 +351,7 @@ fn generic_parser() {
     ];
 
     for (input, expected) in TESTS {
-        let mut input = ParserInput::new(input);
-        let mut input = Parser::new(&mut input);
+        let mut input = Parser::new(input);
 
         let actual: OutputType = parse_color_with(&TestColorParser, &mut input).unwrap();
         assert_eq!(actual, *expected);