chore: Fix new clippy warnings

Author: CohenArthur

dedup/src/lib.rs

@@ -13,7 +13,7 @@ pub trait DeduplicateConstants: Sized {
     fn deduplicate_constants(self) -> Result<Self, Error>;
 }
 
-impl<'ast> DeduplicateConstants for Fir<FlattenData<'ast>> {
+impl DeduplicateConstants for Fir<FlattenData<'_>> {
     fn deduplicate_constants(self) -> Result<Self, Error> {
         let mut ctx = ConstantDeduplicator(HashMap::new());
 

flatten/src/lib.rs

@@ -193,7 +193,7 @@ pub enum AstInfo<'ast> {
     Helper(Symbol, SpanTuple),
 }
 
-impl<'ast> AstInfo<'ast> {
+impl AstInfo<'_> {
     pub fn location(&self) -> &SpanTuple {
         match self {
             AstInfo::Node(Ast { location, .. })

name_resolve/src/declarator.rs

@@ -12,7 +12,7 @@ enum DefinitionKind {
 
 pub(crate) struct Declarator<'ctx, 'enclosing>(pub(crate) &'ctx mut NameResolveCtx<'enclosing>);
 
-impl<'ctx, 'enclosing> Declarator<'ctx, 'enclosing> {
+impl Declarator<'_, '_> {
     fn define(
         &mut self,
         kind: DefinitionKind,
@@ -41,9 +41,7 @@ impl<'ctx, 'enclosing> Declarator<'ctx, 'enclosing> {
     }
 }
 
-impl<'ast, 'ctx, 'enclosing> Traversal<FlattenData<'ast>, NameResolutionError>
-    for Declarator<'ctx, 'enclosing>
-{
+impl<'ast> Traversal<FlattenData<'ast>, NameResolutionError> for Declarator<'_, '_> {
     // TODO: Can we factor these three functions?
 
     fn traverse_function(

name_resolve/src/lib.rs

@@ -109,7 +109,7 @@ impl<'scope, 'enclosing> LookupIterator<'scope, 'enclosing> for FlatScope<'enclo
     }
 }
 
-impl<'scope, 'enclosing> Iterator for FlatIterator<'scope, 'enclosing> {
+impl<'scope> Iterator for FlatIterator<'scope, '_> {
     type Item = &'scope Bindings;
 
     fn next(&mut self) -> Option<Self::Item> {
@@ -125,7 +125,7 @@ impl<'scope, 'enclosing> Iterator for FlatIterator<'scope, 'enclosing> {
     }
 }
 
-impl<'enclosing> FlatScope<'enclosing> {
+impl FlatScope<'_> {
     fn lookup(&self, name: &Symbol, starting_scope: Scope) -> Option<&OriginIdx> {
         self.lookup_iterator(starting_scope)
             .find_map(|bindings| bindings.get(name))
@@ -163,7 +163,7 @@ struct NameResolveCtx<'enclosing> {
 }
 
 impl<'enclosing> NameResolveCtx<'enclosing> {
-    fn new(enclosing_scope: EnclosingScope<'enclosing>) -> NameResolveCtx {
+    fn new(enclosing_scope: EnclosingScope<'enclosing>) -> NameResolveCtx<'enclosing> {
         let empty_scope_map: HashMap<Scope, Bindings> = enclosing_scope
             .0
             .values()
@@ -314,7 +314,7 @@ impl NameResolutionError {
     }
 }
 
-impl<'enclosing> NameResolveCtx<'enclosing> {
+impl NameResolveCtx<'_> {
     fn scope(fir: &Fir<FlattenData>) -> HashMap<OriginIdx, Scope> {
         let root = fir.nodes.last_key_value().unwrap();
 
@@ -346,9 +346,7 @@ impl<'enclosing> NameResolveCtx<'enclosing> {
     }
 }
 
-impl<'ast, 'enclosing> Pass<FlattenData<'ast>, FlattenData<'ast>, Error>
-    for NameResolveCtx<'enclosing>
-{
+impl<'ast> Pass<FlattenData<'ast>, FlattenData<'ast>, Error> for NameResolveCtx<'_> {
     fn pre_condition(_fir: &Fir<FlattenData>) {}
 
     fn post_condition(_fir: &Fir<FlattenData>) {}

name_resolve/src/resolver.rs

@@ -26,7 +26,7 @@ impl Display for ResolveKind {
 
 pub(crate) struct Resolver<'ctx, 'enclosing>(pub(crate) &'ctx mut NameResolveCtx<'enclosing>);
 
-impl<'ctx, 'enclosing> Resolver<'ctx, 'enclosing> {
+impl Resolver<'_, '_> {
     fn get_definition(
         &self,
         kind: ResolveKind,
@@ -54,9 +54,7 @@ impl<'ctx, 'enclosing> Resolver<'ctx, 'enclosing> {
     }
 }
 
-impl<'ast, 'ctx, 'enclosing> Mapper<FlattenData<'ast>, FlattenData<'ast>, NameResolutionError>
-    for Resolver<'ctx, 'enclosing>
-{
+impl<'ast> Mapper<FlattenData<'ast>, FlattenData<'ast>, NameResolutionError> for Resolver<'_, '_> {
     fn map_call(
         &mut self,
         data: FlattenData<'ast>,

src/context/scope_map.rs

@@ -87,7 +87,7 @@ impl<V, F, T> ScopeMap<V, F, T> {
         &'map self,
         key: &Q,
         map_extractor: impl Fn(&Scope<V, F, T>) -> &HashMap<K, U>,
-    ) -> Option<&U>
+    ) -> Option<&'map U>
     where
         K: Borrow<Q> + Hash + Eq + 'map,
         Q: Hash + Eq + ?Sized,

src/ffi.rs

@@ -248,7 +248,7 @@ mod tests {
         let call = call.downcast_ref::<FunctionCall>().unwrap();
 
         assert_eq!(
-            execute(&dec, &call, &mut i),
+            execute(dec, call, &mut i),
             Ok(Some(JkInt::from(15).to_instance()))
         );
     }
@@ -264,12 +264,12 @@ mod tests {
         let call = constructs::expr(span!("print_something()")).unwrap().1;
         let call = call.downcast_ref::<FunctionCall>().unwrap();
 
-        assert_eq!(execute(&dec, &call, &mut i), Ok(None));
+        assert_eq!(execute(dec, call, &mut i), Ok(None));
     }
 
     #[test]
     fn load_libs_stress() {
-        let ld_library_path = std::env::var("LD_LIBRARY_PATH").unwrap_or(String::new());
+        let ld_library_path = std::env::var("LD_LIBRARY_PATH").unwrap_or_default();
         let pwd = std::env::var("PWD").unwrap();
         std::env::set_var(
             "LD_LIBRARY_PATH",

src/instruction/binary_op.rs

@@ -268,7 +268,7 @@ mod tests {
     fn comparison_precedence() {
         assert_bool(
             "1 + 4 * 2 - 1 + 2 * (14 + (2 - 17) * 1) - 12 + 3 / 2 < 45",
-            1 + 4 * 2 - 1 + 2 * (14 + (2 - 17) * 1) - 12 + 3 / 2 < 45,
+            1 + 4 * 2 - 1 + 2 * (14 + (2 - 17)) - 12 + 3 / 2 < 45,
         );
     }
 
@@ -375,17 +375,17 @@ mod tests {
 
     #[test]
     fn binop_execute_valid_mul() {
-        binop_assert!(1 * 2);
+        binop_assert!(2);
     }
 
     #[test]
     fn binop_execute_valid_normal_priority() {
-        binop_assert!(1 * 2 + 3);
+        binop_assert!(2 + 3);
     }
 
     #[test]
     fn binop_execute_valid_back_priority() {
-        binop_assert!(3 + 1 * 2);
+        binop_assert!(3 + 2);
     }
 
     #[test]
@@ -410,6 +410,6 @@ mod tests {
 
     #[test]
     fn binop_execute_valid_extremely_complex_expr() {
-        binop_assert!(1 + 4 * 2 - 1 + 2 * (14 + (2 - 17) * 1) - 12 + 3 / 2);
+        binop_assert!(1 + 4 * 2 - 1 + 2 * (14 + (2 - 17)) - 12 + 3 / 2);
     }
 }

src/instruction/field_access.rs

@@ -134,13 +134,11 @@ mod tests {
     use crate::{jinko, jinko_fail, span};
 
     fn setup() -> Context {
-        let ctx = jinko! {
+        jinko! {
             type Point(x: int, y:int);
             func basic() -> Point { Point ( x : 15, y : 14 )}
             b = basic();
-        };
-
-        ctx
+        }
     }
 
     #[test]

src/parser/constructs.rs

@@ -759,9 +759,9 @@ fn generic_func_or_type_inst_args(
     func_or_type_inst_args(next(input), id, generics, start_loc)
 }
 
-///
-/// ARGS
-///
+//
+// ARGS
+//
 
 /// args = expr ( ',' expr )* ')'
 ///      | ')'