Merge pull request #441 from ltratt/clippy_fixes

Clippy fixes.
softdevteam · Mar 5, 2024 · b5abf08 · b5abf08
2 parents c81212e + 33dae79
commit b5abf08
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 7 deletions.
diff --git a/cfgrammar/src/lib/idxnewtype.rs b/cfgrammar/src/lib/idxnewtype.rs
@@ -3,7 +3,7 @@
 
 use std::mem::size_of;
 
-use num_traits::{self, PrimInt, Unsigned};
+use num_traits::{PrimInt, Unsigned};
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 

diff --git a/cfgrammar/src/lib/yacc/grammar.rs b/cfgrammar/src/lib/yacc/grammar.rs
@@ -1,7 +1,7 @@
 #![allow(clippy::derive_partial_eq_without_eq)]
 use std::{cell::RefCell, collections::HashMap, fmt::Write};
 
-use num_traits::{self, AsPrimitive, PrimInt, Unsigned};
+use num_traits::{AsPrimitive, PrimInt, Unsigned};
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 use vob::Vob;

diff --git a/lrlex/src/lib/ctbuilder.rs b/lrlex/src/lib/ctbuilder.rs
@@ -4,7 +4,6 @@ use std::{
     any::type_name,
     borrow::Cow,
     collections::{HashMap, HashSet},
-    convert::AsRef,
     env::{current_dir, var},
     error::Error,
     fmt::{Debug, Display, Write as _},

diff --git a/lrlex/src/lib/lexer.rs b/lrlex/src/lib/lexer.rs
@@ -9,7 +9,7 @@ use std::{
 
 use cfgrammar::{NewlineCache, Span};
 use num_traits::{AsPrimitive, PrimInt, Unsigned};
-use regex::{self, Regex, RegexBuilder};
+use regex::{Regex, RegexBuilder};
 
 use lrpar::{Lexeme, Lexer, LexerTypes, NonStreamingLexer};
 
@@ -448,7 +448,7 @@ where
         LRNonStreamingLexer::new(s, lexemes, NewlineCache::from_str(s).unwrap())
     }
 
-    fn state_matches(state: &StartState, rule_states: &Vec<usize>) -> bool {
+    fn state_matches(state: &StartState, rule_states: &[usize]) -> bool {
         if rule_states.is_empty() {
             !state.exclusive
         } else {

diff --git a/lrpar/examples/calc_actions/build.rs b/lrpar/examples/calc_actions/build.rs
@@ -1,6 +1,6 @@
 #![deny(rust_2018_idioms)]
 use cfgrammar::yacc::YaccKind;
-use lrlex::{self, CTLexerBuilder};
+use lrlex::CTLexerBuilder;
 
 fn main() {
     // Since we're using both lrlex and lrpar, we use lrlex's `lrpar_config` convenience function

diff --git a/lrpar/src/lib/ctbuilder.rs b/lrpar/src/lib/ctbuilder.rs
@@ -4,7 +4,6 @@ use std::{
     any::type_name,
     borrow::Cow,
     collections::{HashMap, HashSet},
-    convert::AsRef,
     env::{current_dir, var},
     error::Error,
     fmt::{self, Debug, Write as fmtWrite},