Clippy fixes

Author: Lut99

brane-ast/src/dsl.rs

@@ -41,9 +41,7 @@ pub fn dtype_dsl_to_ast(value: brane_dsl::DataType) -> DataType {
         Semver => DataType::Semver,
 
         Array(a) => DataType::Array { elem_type: Box::new(dtype_dsl_to_ast(*a)) },
-        Function(sig) => {
-            DataType::Function { args: sig.args.into_iter().map(|d| dtype_dsl_to_ast(d)).collect(), ret: Box::new(dtype_dsl_to_ast(sig.ret)) }
-        },
+        Function(sig) => DataType::Function { args: sig.args.into_iter().map(dtype_dsl_to_ast).collect(), ret: Box::new(dtype_dsl_to_ast(sig.ret)) },
         Class(name) => {
             // Match if 'Data' or 'IntermediateResult'
             if name == BuiltinClasses::Data.name() {

brane-ast/src/state.rs

@@ -357,7 +357,7 @@ impl From<FunctionState> for FunctionDef {
     fn from(value: FunctionState) -> Self {
         FunctionDef {
             name: value.name,
-            args: value.signature.args.into_iter().map(|d| dtype_dsl_to_ast(d)).collect(),
+            args: value.signature.args.into_iter().map(dtype_dsl_to_ast).collect(),
             ret:  dtype_dsl_to_ast(value.signature.ret),
         }
     }
@@ -416,7 +416,7 @@ impl From<TaskState> for TaskDef {
 
             function:     Box::new(FunctionDef {
                 name: value.name,
-                args: value.signature.args.into_iter().map(|d| dtype_dsl_to_ast(d)).collect(),
+                args: value.signature.args.into_iter().map(dtype_dsl_to_ast).collect(),
                 ret:  dtype_dsl_to_ast(value.signature.ret),
             }),
             args_names:   value.arg_names,
@@ -459,7 +459,7 @@ impl ClassState {
         // Collect the properties
         let props: Vec<VarState> = builtin
             .props()
-            .into_iter()
+            .iter()
             .map(|(name, dtype)| VarState {
                 name: (*name).into(),
                 data_type: dtype_ast_to_dsl(dtype.clone()),
@@ -472,7 +472,7 @@ impl ClassState {
         // Collect the methods
         let methods: Vec<usize> = builtin
             .methods()
-            .into_iter()
+            .iter()
             .enumerate()
             .map(|(i, (name, sig))| {
                 funcs.push(FunctionState {

brane-chk/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "brane-chk"
 edition = "2021"
-rust-version = "1.74"
+rust-version = "1.80"
 version.workspace = true
 repository.workspace = true
 authors = ["Tim Müller", "Bas Kloosterman", "Daniel Voogsgerd"]
@@ -38,9 +38,22 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 
 # eflint-json = { git = "https://gitlab.com/eflint/json-spec-rs", branch = "incorrect-is-invariant", features = ["display_eflint"] }
 enum-debug = { git = "https://github.com/Lut99/enum-debug", tag = "v1.1.0" }
-error-trace = { git = "https://github.com/Lut99/error-trace-rs", tag = "v3.3.0", features = ["serde"] }
-policy-reasoner = { git = "https://github.com/BraneFramework/policy-reasoner", branch = "lib-refactor", default-features = false, features = ["eflint-haskell-reasoner", "file-logger", "serde", "workflow"] }
-policy-store = { git = "https://github.com/BraneFramework/policy-store", default-features = false, features = ["axum-server", "jwk-auth", "jwk-auth-kid", "sqlite-database", "sqlite-database-embedded-migrations"] }
+error-trace = { git = "https://github.com/Lut99/error-trace-rs", tag = "v3.3.0", features = [
+    "serde",
+] }
+policy-reasoner = { git = "https://github.com/BraneFramework/policy-reasoner", branch = "lib-refactor", default-features = false, features = [
+    "eflint-haskell-reasoner",
+    "file-logger",
+    "serde",
+    "workflow",
+] }
+policy-store = { git = "https://github.com/BraneFramework/policy-store", default-features = false, features = [
+    "axum-server",
+    "jwk-auth",
+    "jwk-auth-kid",
+    "sqlite-database",
+    "sqlite-database-embedded-migrations",
+] }
 
 brane-ast = { path = "../brane-ast" }
 brane-cfg = { path = "../brane-cfg" }
@@ -50,7 +63,10 @@ specifications = { path = "../specifications" }
 
 [dev-dependencies]
 humanlog = { git = "https://github.com/Lut99/humanlog-rs", tag = "v0.2.0" }
-names = { git = "https://github.com/Lut99/names-rs", features = ["rand", "three"] }
+names = { git = "https://github.com/Lut99/names-rs", features = [
+    "rand",
+    "three",
+] }
 
 brane-shr = { path = "../brane-shr" }
 

brane-chk/src/apis/deliberation.rs

@@ -57,7 +57,7 @@ use crate::workflow::compile::pc_to_id;
 
 /***** CONSTANTS *****/
 /// The initiator claim that must be given in the input header token.
-pub const INITIATOR_CLAIM: &'static str = "username";
+pub const INITIATOR_CLAIM: &str = "username";
 
 
 

brane-chk/src/reasonerconn.rs

@@ -56,13 +56,13 @@ impl EFlintHaskellReasonerConnectorWithInterface {
     /// its manifest directory). Building the reasoner will trigger the first load, if any,
     /// and this may panic if the input is somehow ill-formed.
     #[inline]
-    pub fn new_async<'l, L: AuditLogger>(
+    pub async fn new_async<'l, L: AuditLogger>(
         cmd: impl 'l + IntoIterator<Item = String>,
         base_policy_path: impl 'l + Into<PathBuf>,
         handler: PrefixedHandler<'static>,
         logger: &'l L,
-    ) -> impl 'l + Future<Output = Result<Self, Error>> {
-        async move { Ok(Self { reasoner: EFlintHaskellReasonerConnector::new_async(cmd, base_policy_path, handler, logger).await? }) }
+    ) -> Result<Self, Error> {
+        Ok(Self { reasoner: EFlintHaskellReasonerConnector::new_async(cmd, base_policy_path, handler, logger).await? })
     }
 }
 impl ReasonerConnector for EFlintHaskellReasonerConnectorWithInterface {

brane-chk/src/stateresolver.rs

@@ -46,7 +46,7 @@ use crate::workflow::compile;
 static DATABASE_USER: LazyLock<User> = LazyLock::new(|| User { id: "brane".into(), name: "Brane".into() });
 
 /// The special policy that is used when the database doesn't mention any active.
-static DENY_ALL_POLICY: &'static str = "Invariant contradiction When False.";
+static DENY_ALL_POLICY: &str = "Invariant contradiction When False.";
 
 
 
@@ -350,7 +350,7 @@ async fn assert_workflow_context(_wf: &Workflow, usecase: &str, usecases: &HashM
 async fn get_active_policy(base_policy_hash: &str, db: &SQLiteDatabase<String>, res: &mut String) -> Result<(), Error> {
     // Time to fetch a connection
     debug!("Connecting to backend database...");
-    let mut conn: SQLiteConnection<String> = match db.connect(&*DATABASE_USER).await {
+    let mut conn: SQLiteConnection<String> = match db.connect(&DATABASE_USER).await {
         Ok(conn) => conn,
         Err(err) => return Err(Error::DatabaseConnect { err }),
     };

brane-chk/src/workflow/compile.rs

@@ -30,10 +30,10 @@ use super::{preprocess, utils};
 
 /***** CONSTANTS *****/
 /// The name of the special commit call.
-pub const COMMIT_CALL_NAME: &'static str = "__brane_internals::commit";
+pub const COMMIT_CALL_NAME: &str = "__brane_internals::commit";
 
 /// The name of the special identity function call.
-pub const TOPLEVEL_RETURN_CALL_NAME: &'static str = "__brane_internals::toplevel_return";
+pub const TOPLEVEL_RETURN_CALL_NAME: &str = "__brane_internals::toplevel_return";
 
 
 
@@ -256,7 +256,7 @@ fn reconstruct_graph(
 
             // Return the elem
             Ok(Elem::Call(ElemCall {
-                id: pc_to_id(&wir, pc),
+                id: pc_to_id(wir, pc),
                 task: format!("{}[{}]::{}", def.package, def.version, def.function.name),
                 input: input
                     .iter()

brane-chk/src/workflow/compiler.rs

@@ -265,7 +265,7 @@ fn workflow_to_output(path: &str, lang: OutputLanguage, workflow: Workflow) {
     // OK, now write to out or stdout
     if path == "-" {
         debug!("Writing result to stdout...");
-        if let Err(err) = std::io::stdout().write_all(&output.as_bytes()) {
+        if let Err(err) = std::io::stdout().write_all(output.as_bytes()) {
             error!("{}", trace!(("Failed to write to stdout"), err));
             std::process::exit(1);
         }

brane-chk/src/workflow/eflint.rs

@@ -100,9 +100,9 @@ fn compile_metadata(metadata: &Metadata, phrases: &mut Vec<String>) {
 /***** FORMATTERS *****/
 /// Serializes a workflow to eFLINT using it's [`Display`]-implementation.
 pub struct WorkflowToEflint<'w>(pub &'w Workflow);
-impl<'w> Display for WorkflowToEflint<'w> {
+impl Display for WorkflowToEflint<'_> {
     #[inline]
-    fn fmt(&self, f: &mut Formatter<'_>) -> FResult { eflint_fmt(&self.0, f) }
+    fn fmt(&self, f: &mut Formatter<'_>) -> FResult { eflint_fmt(self.0, f) }
 }
 
 
@@ -231,7 +231,7 @@ impl<'w> Visitor<'w> for DataAnalyzer<'w> {
             self.first.push((id.clone(), analyzer.first.into_iter().flat_map(|(_, data)| data).collect()));
         }
         self.last.clear();
-        self.last.extend(analyzer.last.into_iter());
+        self.last.extend(analyzer.last);
 
         // Continue with iteration
         Ok(Some(&elem.next))
@@ -413,7 +413,7 @@ impl<'w> Visitor<'w> for EFlintCompiler<'w> {
         self.phrases.push(create!(constr_app!("loop", node.clone())));
 
         // Collect the inputs & outputs of the body
-        let mut analyzer = DataAnalyzer::new(&self.names);
+        let mut analyzer = DataAnalyzer::new(self.names);
         analyzer.visit(&elem.body)?;
 
         // Post-process the input into a list of body nodes and a list of data input

brane-chk/src/workflow/preprocess.rs

@@ -56,6 +56,10 @@ mod tests {
         }
 
         // Defines a few test files with expected inlinable functions
+        // NOTE: Sorry Clippy, it may be a complex type but at least you can see what's expected
+        // from every line. Not gonna go through the hassle of splitting this up for just a quick
+        // inline one.
+        #[allow(clippy::type_complexity)]
         let tests: [(&str, &str, HashMap<usize, Option<HashSet<usize>>>); 5] = [
             ("case1", r#"println("Hello, world!");"#, HashMap::from([(1, None)])),
             (