Merge pull request #353 from softmoth/rust-24159-is-fixed

Remove extraneous Input::Error trait bounds

.github/workflows/rust.yml

@@ -13,7 +13,7 @@ jobs:
   build:
     strategy:
       matrix:
-        rust: [1.40.0, stable, beta, nightly]
+        rust: [1.51.0, stable, beta, nightly]
     env:
       CARGO_INCREMENTAL: 0 # Incremental compilation is slower and bloats the cache
       RUST_BACKTRACE: 1
@@ -32,14 +32,14 @@ jobs:
     - name: Build
       run: cargo build
 
-    - name: Check 1.40
-      if: ${{ matrix.rust == '1.40.0' }}
+    - name: Check 1.51
+      if: ${{ matrix.rust == '1.51.0' }}
       run: |
         cargo "$@" check
         cargo "$@" check --no-default-features
 
     - name: Run tests
-      if: ${{ matrix.rust != '1.40.0' }}
+      if: ${{ matrix.rust != '1.51.0' }}
       run: ./ci.sh
 
     - name: Check docs

benches/http.rs

@@ -74,15 +74,13 @@ fn is_http_version(c: u8) -> bool {
 fn end_of_line<'a, Input>() -> impl Parser<Input, Output = u8>
 where
     Input: RangeStream<Token = u8, Range = &'a [u8]>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     (token(b'\r'), token(b'\n')).map(|_| b'\r').or(token(b'\n'))
 }
 
 fn message_header<'a, Input>() -> impl Parser<Input, Output = Header<'a>>
 where
     Input: RangeStream<Token = u8, Range = &'a [u8]>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     let message_header_line = (
         take_while1(is_horizontal_space),
@@ -103,7 +101,6 @@ type HttpRequest<'a> = (Request<'a>, Vec<Header<'a>>);
 fn parse_http_request<'a, Input>(input: Input) -> Result<(HttpRequest<'a>, Input), Input::Error>
 where
     Input: RangeStream<Token = u8, Range = &'a [u8]>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     let http_version = range(&b"HTTP/"[..]).with(take_while1(is_http_version));
 
@@ -155,7 +152,7 @@ fn http_requests_large_cheap_error(b: &mut Bencher<'_>) {
 fn http_requests_bench<'a, Input>(b: &mut Bencher<'_>, buffer: Input)
 where
     Input: RangeStream<Token = u8, Range = &'a [u8]> + Clone,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position> + fmt::Debug,
+    Input::Error: fmt::Debug,
 {
     b.iter(|| {
         let mut buf = black_box(buffer.clone());

benches/json.rs

@@ -55,7 +55,6 @@ where
 fn integer<Input>() -> impl Parser<Input, Output = i64>
 where
     Input: Stream<Token = char>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     lex(many1(digit()))
         .map(|s: String| {
@@ -71,7 +70,6 @@ where
 fn number<Input>() -> impl Parser<Input, Output = f64>
 where
     Input: Stream<Token = char>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     let i = char('0').map(|_| 0.0).or(integer().map(|x| x as f64));
     let fractional = many(digit()).map(|digits: String| {
@@ -105,7 +103,6 @@ where
 fn json_char<Input>() -> impl Parser<Input, Output = char>
 where
     Input: Stream<Token = char>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     parser(|input: &mut Input| {
         let (c, committed) = any().parse_lazy(input).into_result()?;
@@ -133,15 +130,13 @@ where
 fn json_string<Input>() -> impl Parser<Input, Output = String>
 where
     Input: Stream<Token = char>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     between(char('"'), lex(char('"')), many(json_char())).expected("string")
 }
 
 fn object<Input>() -> impl Parser<Input, Output = Value>
 where
     Input: Stream<Token = char>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     let field = (json_string(), lex(char(':')), json_value()).map(|t| (t.0, t.2));
     let fields = sep_by(field, lex(char(',')));
@@ -154,7 +149,6 @@ where
 fn json_value<Input>() -> impl Parser<Input, Output = Value>
 where
     Input: Stream<Token = char>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     json_value_()
 }

examples/async.rs

@@ -56,8 +56,6 @@ fn decode_parser<'a, Input>(
 ) -> impl Parser<Input, Output = Vec<u8>, PartialState = AnyPartialState> + 'a
 where
     Input: RangeStream<Token = u8, Range = &'a [u8]> + 'a,
-    // Necessary due to rust-lang/rust#24159
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     let content_length = range(&b"Content-Length: "[..])
         .with(recognize(skip_many1(digit())).and_then(|digits: &[u8]| {

examples/date.rs

@@ -9,7 +9,6 @@ use std::{
 
 use combine::{
     choice,
-    error::ParseError,
     many, optional,
     parser::char::{char, digit},
     stream::position,
@@ -63,8 +62,6 @@ pub struct DateTime {
 fn two_digits<Input>() -> impl Parser<Input, Output = i32>
 where
     Input: Stream<Token = char>,
-    // Necessary due to rust-lang/rust#24159
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     (digit(), digit()).map(|(x, y): (char, char)| {
         let x = x.to_digit(10).expect("digit");
@@ -81,7 +78,6 @@ where
 fn time_zone<Input>() -> impl Parser<Input, Output = i32>
 where
     Input: Stream<Token = char>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     let utc = char('Z').map(|_| 0);
     let offset = (
@@ -106,7 +102,6 @@ where
 fn date<Input>() -> impl Parser<Input, Output = Date>
 where
     Input: Stream<Token = char>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     (
         many::<String, _, _>(digit()),
@@ -130,7 +125,6 @@ where
 fn time<Input>() -> impl Parser<Input, Output = Time>
 where
     Input: Stream<Token = char>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     (
         two_digits(),
@@ -156,7 +150,6 @@ where
 fn date_time<Input>() -> impl Parser<Input, Output = DateTime>
 where
     Input: Stream<Token = char>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     (date(), char('T'), time()).map(|(date, _, time)| DateTime { date, time })
 }

examples/ini.rs

@@ -41,8 +41,6 @@ pub struct Ini {
 fn property<Input>() -> impl Parser<Input, Output = (String, String)>
 where
     Input: Stream<Token = char>,
-    // Necessary due to rust-lang/rust#24159
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     (
         many1(satisfy(|c| c != '=' && c != '[' && c != ';')),
@@ -56,7 +54,6 @@ where
 fn whitespace<Input>() -> impl Parser<Input>
 where
     Input: Stream<Token = char>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     let comment = (token(';'), skip_many(satisfy(|c| c != '\n'))).map(|_| ());
     // Wrap the `spaces().or(comment)` in `skip_many` so that it skips alternating whitespace and
@@ -67,7 +64,6 @@ where
 fn properties<Input>() -> impl Parser<Input, Output = HashMap<String, String>>
 where
     Input: Stream<Token = char>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     // After each property we skip any whitespace that followed it
     many(property().skip(whitespace()))
@@ -76,7 +72,6 @@ where
 fn section<Input>() -> impl Parser<Input, Output = (String, HashMap<String, String>)>
 where
     Input: Stream<Token = char>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     (
         between(token('['), token(']'), many(satisfy(|c| c != ']'))),
@@ -90,7 +85,6 @@ where
 fn ini<Input>() -> impl Parser<Input, Output = Ini>
 where
     Input: Stream<Token = char>,
-    Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 {
     (whitespace(), properties(), many(section()))
         .map(|(_, global, sections)| Ini { global, sections })

src/error.rs

@@ -296,7 +296,6 @@ impl<T> Commit<T> {
     /// //and " respectively
     /// fn char<Input>(input: &mut Input) -> StdParseResult<char, Input>
     ///     where Input: Stream<Token = char>,
-    ///           Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
     /// {
     ///     let (c, committed) = satisfy(|c| c != '"').parse_stream(input).into_result()?;
     ///     match c {

src/lib.rs

@@ -108,8 +108,6 @@
 //! // `impl Parser` can be used to create reusable parsers with zero overhead
 //! fn expr_<Input>() -> impl Parser< Input, Output = Expr>
 //!     where Input: Stream<Token = char>,
-//!           // Necessary due to rust-lang/rust#24159
-//!           Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
 //! {
 //!     let word = many1(letter());
 //!
@@ -259,7 +257,6 @@ pub use crate::parser::token::tokens_cmp;
 ///     fn integer[Input]()(Input) -> i32
 ///     where [
 ///         Input: Stream<Token = char>,
-///         Input::Error: ParseError<char, Input::Range, Input::Position>,
 ///         <Input::Error as ParseError<Input::Token, Input::Range, Input::Position>>::StreamError:
 ///             From<::std::num::ParseIntError>,
 ///     ]
@@ -283,7 +280,6 @@ pub use crate::parser::token::tokens_cmp;
 ///     pub fn integer_or_string[Input]()(Input) -> IntOrString
 ///     where [
 ///         Input: Stream<Token = char>,
-///         Input::Error: ParseError<char, Input::Range, Input::Position>,
 ///         <Input::Error as ParseError<Input::Token, Input::Range, Input::Position>>::StreamError:
 ///             From<::std::num::ParseIntError>,
 ///     ]
@@ -709,7 +705,6 @@ mod std_tests {
     fn integer<Input>(input: &mut Input) -> StdParseResult<i64, Input>
     where
         Input: Stream<Token = char>,
-        Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
     {
         let (s, input) = many1::<String, _, _>(digit())
             .expected("integer")
@@ -834,7 +829,6 @@ mod std_tests {
     fn term<Input>(input: &mut Input) -> StdParseResult<Expr, Input>
     where
         Input: Stream<Token = char>,
-        Input::Error: ParseError<Input::Token, Input::Range, Input::Position>,
     {
         fn times(l: Expr, r: Expr) -> Expr {
             Expr::Times(Box::new(l), Box::new(r))