Fix build issues

- minimal update dependencies to address advisory issues
- fix clippy errors

Author: eikek

Cargo.lock

@@ -19,14 +19,14 @@ clap_complete = "4.5.13"
 console = {version = "0.15.8"}
 env_logger = { version = "0.11.5" }
 log = { version = "0.4.22" }
-openssl = { version = "0.10.64", optional = true }
-reqwest = { version = "0.12.7", default-features = false, features = ["json", "multipart"] }
+openssl = { version = "0.10.75", optional = true }
+reqwest = { version = "0.12.28", default-features = false, features = ["json", "multipart"] }
 serde = { version = "1.0.210", features = ["derive"] }
 serde_json = "1.0.128"
 snafu = { version = "0.8.5" }
 tokio = { version = "1", features = ["full"] }
 futures = { version = "0.3" }
-regex = { version = "1.11.0" }
+regex = { version = "1.12.3" }
 iso8601-timestamp = { version = "0.2.17" }
 toml = { version = "0.8.19" }
 git2 = { version = "0.19.0", default-features = false, features = [ "vendored-libgit2", "https", "ssh" ]}

Cargo.toml

@@ -4,8 +4,8 @@ allow = [
   "Apache-2.0",
   "0BSD",
   "Unicode-3.0",
-  "ISC",
   "BSD-3-Clause",
+  "MPL-2.0"
 ]
 
 [[licenses.clarify]]
@@ -20,7 +20,6 @@ ignore = [
   # https://github.com/ramosbugs/openidconnect-rs/issues/140
   "RUSTSEC-2023-0071",
 
-  # https://rustsec.org/advisories/RUSTSEC-2024-0320
-  # used by comrak
-  "RUSTSEC-2024-0320"
+  # https://rustsec.org/advisories/RUSTSEC-2023-0071
+  "RUSTSEC-2023-0071"
 ]

deny.toml

@@ -13,12 +13,12 @@ use snafu::{ResultExt, Snafu};
 /// The login consists of two parts:
 ///
 /// 1. Renku is queried to return a temporary URL that can be used to
-/// authenticate and authorize this application. The url must be
-/// opened with some device and the user code must be entered (if
-/// necessary).
+///    authenticate and authorize this application. The url must be
+///    opened with some device and the user code must be entered (if
+///    necessary).
 ///
 /// 2. Once the first step is complete, the cli can obtain an access
-/// token and does so by periodically polling the renku platform.
+///    token and does so by periodically polling the renku platform.
 ///
 /// The login command can do these two steps separately. This requires
 /// to run with `--user-code-only` to omit the second step and store
@@ -68,7 +68,7 @@ enum Steps<'a> {
     Complete,
 }
 impl Input {
-    fn get_steps(&self) -> Steps {
+    fn get_steps(&self) -> Steps<'_> {
         if let Some(p) = &self.continue_from {
             Steps::Continue(p)
         } else if self.user_code_only {

src/cli/cmd/login.rs

@@ -114,7 +114,7 @@ impl Input {
     }
 }
 
-async fn clone_project<'a>(
+async fn clone_project(
     ctx: Context,
     project: &ProjectDetails,
     target: PathBuf,

src/cli/cmd/project/clone.rs

@@ -75,7 +75,7 @@ enum OutputOption<'a> {
     Stdout,
 }
 impl Input {
-    fn get_output(&self) -> OutputOption {
+    fn get_output(&self) -> OutputOption<'_> {
         if let Some(f) = &self.output_file {
             OutputOption::OutFile(f.as_path())
         } else if let Some(f) = &self.output_dir {

src/cli/cmd/userdoc.rs

@@ -56,7 +56,7 @@ pub struct Versions<'a> {
     pub renku_url: &'a str,
 }
 impl Versions<'_> {
-    pub fn create(server: VersionInfo, renku_url: &str) -> Versions {
+    pub fn create(server: VersionInfo, renku_url: &str) -> Versions<'_> {
         Versions {
             client: BuildInfo::default(),
             server,

src/cli/cmd/version.rs

@@ -69,7 +69,7 @@ fn read_to_string() {
     let id2 = ProjectId::Id("pr-id-42".into());
     let id3 = ProjectId::FullUrl(RenkuUrl::parse("http://localhost/project/1").unwrap());
 
-    for id in vec![id1, id2, id3] {
+    for id in [id1, id2, id3] {
         let id_str = format!("{}", id);
         let id_parsed = ProjectId::parse(&id_str).unwrap();
         assert_eq!(id, id_parsed);

src/data/project_id.rs

@@ -1,26 +1,30 @@
 use assert_cmd::cargo::CargoError;
 use assert_cmd::prelude::*;
+use snafu::Snafu;
 use std::{io, process::Command};
 
-#[derive(Debug)]
+#[derive(Debug, Snafu)]
 pub enum Error {
-    Cargo(CargoError),
-    IO(io::Error),
-    Json(serde_json::Error),
+    #[snafu(display("Cargo Error: {}", source))]
+    Cargo { source: CargoError },
+    #[snafu(display("IO Error: {}", source))]
+    IO { source: io::Error },
+    #[snafu(display("JSON Error: {}", source))]
+    Json { source: serde_json::Error },
 }
 impl std::convert::From<CargoError> for Error {
     fn from(e: CargoError) -> Self {
-        Error::Cargo(e)
+        Error::Cargo { source: e }
     }
 }
 impl std::convert::From<io::Error> for Error {
     fn from(e: io::Error) -> Self {
-        Error::IO(e)
+        Error::IO { source: e }
     }
 }
 impl std::convert::From<serde_json::Error> for Error {
     fn from(e: serde_json::Error) -> Self {
-        Error::Json(e)
+        Error::Json { source: e }
     }
 }