Merge pull request #829 from epage/clippy

style: Make clippy happy

Author: epage

examples/arithmetic/parser_lexer.rs

@@ -89,21 +89,21 @@ impl winnow::stream::ContainsToken<&'_ Token<'_>> for TokenKind {
 impl winnow::stream::ContainsToken<&'_ Token<'_>> for &'_ [TokenKind] {
     #[inline]
     fn contains_token(&self, token: &'_ Token<'_>) -> bool {
-        self.iter().any(|t| *t == token.kind)
+        self.contains(&token.kind)
     }
 }
 
 impl<const LEN: usize> winnow::stream::ContainsToken<&'_ Token<'_>> for &'_ [TokenKind; LEN] {
     #[inline]
     fn contains_token(&self, token: &'_ Token<'_>) -> bool {
-        self.iter().any(|t| *t == token.kind)
+        self.contains(&token.kind)
     }
 }
 
 impl<const LEN: usize> winnow::stream::ContainsToken<&'_ Token<'_>> for [TokenKind; LEN] {
     #[inline]
     fn contains_token(&self, token: &'_ Token<'_>) -> bool {
-        self.iter().any(|t| *t == token.kind)
+        self.contains(&token.kind)
     }
 }
 

src/_topic/mod.rs

@@ -25,6 +25,7 @@
 //! - [`toml_edit`](https://crates.io/crates/toml_edit)
 //! - [`hcl-edit`](https://crates.io/crates/hcl-edit)
 #![allow(clippy::std_instead_of_core)]
+#![allow(clippy::test_attr_in_doctest)]
 
 pub mod arithmetic;
 pub mod error;

src/ascii/mod.rs

@@ -5,7 +5,7 @@
 #[cfg(test)]
 mod tests;
 
-use crate::lib::std::ops::{Add, Shl};
+use core::ops::{Add, Shl};
 
 use crate::combinator::alt;
 use crate::combinator::dispatch;
@@ -1118,7 +1118,7 @@ where
             .verify_map(|s: <Input as Stream>::Slice| {
                 let s = s.as_bstr();
                 // SAFETY: Only 7-bit ASCII characters are parsed
-                let s = unsafe { crate::lib::std::str::from_utf8_unchecked(s) };
+                let s = unsafe { core::str::from_utf8_unchecked(s) };
                 Output::try_from_dec_uint(s)
             })
             .parse_next(input)
@@ -1208,7 +1208,7 @@ where
             .verify_map(|s: <Input as Stream>::Slice| {
                 let s = s.as_bstr();
                 // SAFETY: Only 7-bit ASCII characters are parsed
-                let s = unsafe { crate::lib::std::str::from_utf8_unchecked(s) };
+                let s = unsafe { core::str::from_utf8_unchecked(s) };
                 Output::try_from_dec_int(s)
             })
             .parse_next(input)

src/ascii/tests.rs

@@ -15,7 +15,9 @@ mod complete {
     use crate::token::none_of;
     use crate::token::one_of;
     #[cfg(feature = "alloc")]
-    use crate::{lib::std::string::String, lib::std::vec::Vec};
+    use alloc::string::String;
+    #[cfg(feature = "alloc")]
+    use alloc::vec::Vec;
 
     #[test]
     fn character() {

src/binary/bits/mod.rs

@@ -6,9 +6,9 @@ mod tests;
 
 use crate::combinator::trace;
 use crate::error::{ErrorConvert, Needed, ParserError};
-use crate::lib::std::ops::{AddAssign, Div, Shl, Shr};
 use crate::stream::{Stream, StreamIsPartial, ToUsize};
 use crate::{Parser, Result};
+use core::ops::{AddAssign, Div, Shl, Shr};
 
 /// Number of bits in a byte
 const BYTE: usize = u8::BITS as usize;

src/binary/mod.rs

@@ -11,12 +11,12 @@ use crate::combinator::repeat;
 use crate::combinator::trace;
 use crate::error::Needed;
 use crate::error::ParserError;
-use crate::lib::std::ops::{Add, Shl};
 use crate::stream::Accumulate;
 use crate::stream::{Stream, StreamIsPartial};
 use crate::stream::{ToUsize, UpdateSlice};
 use crate::Parser;
 use crate::Result;
+use core::ops::{Add, Shl};
 
 /// Configurable endianness
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]

src/binary/tests.rs

@@ -1163,14 +1163,14 @@ Ok(
 mod partial {
     use super::*;
 
-    #[cfg(feature = "alloc")]
-    use crate::lib::std::vec::Vec;
     use crate::Partial;
     use crate::{
         ascii::digit1 as digit,
         binary::{be_u16, be_u8},
-        lib::std::str::{self, FromStr},
     };
+    #[cfg(feature = "alloc")]
+    use alloc::vec::Vec;
+    use core::str::{self, FromStr};
 
     #[test]
     fn i8_tests() {

src/combinator/debug/internals.rs

@@ -99,7 +99,7 @@ impl AsRef<usize> for Depth {
     }
 }
 
-impl crate::lib::std::ops::Deref for Depth {
+impl core::ops::Deref for Depth {
     type Target = usize;
 
     #[inline(always)]
@@ -130,7 +130,7 @@ impl Severity {
 
 pub(crate) fn start<I: Stream>(
     depth: usize,
-    name: &dyn crate::lib::std::fmt::Display,
+    name: &dyn core::fmt::Display,
     count: usize,
     input: &I,
 ) {
@@ -183,7 +183,7 @@ pub(crate) fn start<I: Stream>(
 
 pub(crate) fn end(
     depth: usize,
-    name: &dyn crate::lib::std::fmt::Display,
+    name: &dyn core::fmt::Display,
     count: usize,
     consumed: usize,
     severity: Severity,
@@ -231,7 +231,7 @@ pub(crate) fn end(
     );
 }
 
-pub(crate) fn result(depth: usize, name: &dyn crate::lib::std::fmt::Display, severity: Severity) {
+pub(crate) fn result(depth: usize, name: &dyn core::fmt::Display, severity: Severity) {
     let gutter_style = anstyle::Style::new().bold();
 
     let (call_width, _) = column_widths();

src/combinator/debug/mod.rs

@@ -38,7 +38,7 @@ use crate::Parser;
 #[cfg_attr(not(feature = "debug"), allow(unused_mut))]
 #[cfg_attr(not(feature = "debug"), inline(always))]
 pub fn trace<I: Stream, O, E: ParserError<I>>(
-    name: impl crate::lib::std::fmt::Display,
+    name: impl core::fmt::Display,
     parser: impl Parser<I, O, E>,
 ) -> impl Parser<I, O, E> {
     #[cfg(feature = "debug")]
@@ -53,7 +53,7 @@ pub fn trace<I: Stream, O, E: ParserError<I>>(
 
 #[cfg_attr(not(feature = "debug"), allow(unused_variables))]
 pub(crate) fn trace_result<T, I: Stream, E: ParserError<I>>(
-    name: impl crate::lib::std::fmt::Display,
+    name: impl core::fmt::Display,
     res: &Result<T, E>,
 ) {
     #[cfg(feature = "debug")]
@@ -66,8 +66,8 @@ pub(crate) fn trace_result<T, I: Stream, E: ParserError<I>>(
 
 pub(crate) struct DisplayDebug<D>(pub(crate) D);
 
-impl<D: crate::lib::std::fmt::Debug> crate::lib::std::fmt::Display for DisplayDebug<D> {
-    fn fmt(&self, f: &mut crate::lib::std::fmt::Formatter<'_>) -> crate::lib::std::fmt::Result {
+impl<D: core::fmt::Debug> core::fmt::Display for DisplayDebug<D> {
+    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         write!(f, "{:?}", self.0)
     }
 }

src/combinator/impls.rs

@@ -7,14 +7,14 @@ use crate::combinator::DisplayDebug;
 #[cfg(feature = "std")]
 use crate::error::FromRecoverableError;
 use crate::error::{AddContext, FromExternalError, ParserError};
-use crate::lib::std::borrow::Borrow;
-use crate::lib::std::ops::Range;
 #[cfg(feature = "unstable-recover")]
 #[cfg(feature = "std")]
 use crate::stream::Recover;
 use crate::stream::StreamIsPartial;
 use crate::stream::{Location, Stream};
 use crate::*;
+use core::borrow::Borrow;
+use core::ops::Range;
 
 /// [`Parser`] implementation for [`Parser::by_ref`]
 pub struct ByRef<'p, P, I, O, E> {
@@ -548,7 +548,7 @@ where
     I: Stream,
     E: AddContext<I, C>,
     E: ParserError<I>,
-    C: Clone + crate::lib::std::fmt::Debug,
+    C: Clone + core::fmt::Debug,
 {
     pub(crate) parser: F,
     pub(crate) context: C,
@@ -563,7 +563,7 @@ where
     I: Stream,
     E: AddContext<I, C>,
     E: ParserError<I>,
-    C: Clone + crate::lib::std::fmt::Debug,
+    C: Clone + core::fmt::Debug,
 {
     #[inline]
     fn parse_next(&mut self, i: &mut I) -> Result<O, E> {
@@ -586,7 +586,7 @@ where
     E: AddContext<I, C>,
     E: ParserError<I>,
     F: Fn() -> FI + Clone,
-    C: crate::lib::std::fmt::Debug,
+    C: core::fmt::Debug,
     FI: Iterator<Item = C>,
 {
     pub(crate) parser: P,
@@ -605,7 +605,7 @@ where
     E: AddContext<I, C>,
     E: ParserError<I>,
     F: Fn() -> FI + Clone,
-    C: crate::lib::std::fmt::Debug,
+    C: core::fmt::Debug,
     FI: Iterator<Item = C>,
 {
     #[inline]