Merge pull request #252 from 1Password/update-for-new-clippy-lints

Update for newer clippy lints

Author: darrell-roberts

Cargo.lock

@@ -13,10 +13,10 @@ ci = ["github"]
 installers = ["shell", "powershell"]
 # Target platforms to build apps for (Rust target-triple syntax)
 targets = [
-  "x86_64-unknown-linux-gnu",
-  "x86_64-apple-darwin",
-  "x86_64-pc-windows-msvc",
-  "aarch64-apple-darwin",
+    "x86_64-unknown-linux-gnu",
+    "x86_64-apple-darwin",
+    "x86_64-pc-windows-msvc",
+    "aarch64-apple-darwin",
 ]
 
 [profile.test]
@@ -35,4 +35,4 @@ inherits = "release"
 
 [workspace.dependencies]
 log = "0.4"
-flexi_logger = "0.28"
+flexi_logger = "0.30"

Cargo.toml

@@ -17,10 +17,10 @@ python = []
 
 [dependencies]
 clap = { version = "4.5", features = [
-  "cargo",
-  "derive",
-  "unicode",
-  "wrap_help",
+    "cargo",
+    "derive",
+    "unicode",
+    "wrap_help",
 ] }
 ignore = "0.4"
 once_cell = "1"
@@ -30,5 +30,5 @@ typeshare-core = { path = "../core", version = "=1.13.2" }
 log.workspace = true
 flexi_logger.workspace = true
 anyhow = "1"
-clap_complete = "4.5.32"
+clap_complete = "4.5"
 crossbeam = "0.8"

cli/Cargo.toml

@@ -101,7 +101,7 @@ pub(crate) fn load_config(file_path: Option<&Path>) -> Result<Config, io::Error>
 
     if let Some(file_path) = file_path {
         let config_string = fs::read_to_string(file_path)?;
-        toml::from_str(&config_string).map_err(|e| io::Error::new(io::ErrorKind::Other, e))
+        toml::from_str(&config_string).map_err(io::Error::other)
     } else {
         Ok(Config::default())
     }

cli/src/config.rs

@@ -10,12 +10,12 @@ repository = "https://github.com/1Password/typeshare"
 proc-macro2 = "1"
 quote = "1"
 syn = { version = "2", features = ["full", "visit"] }
-thiserror = "1"
-itertools = "0.12"
+thiserror = "2"
+itertools = "0.14"
 lazy_format = "2"
-joinery = "2"
-topological-sort = { version = "0.2.2"}
-convert_case = { version = "0.6.0"}
+joinery = "3.1"
+topological-sort = { version = "0.2.2" }
+convert_case = { version = "0.8" }
 log.workspace = true
 flexi_logger.workspace = true
 

core/Cargo.toml

@@ -196,7 +196,7 @@ impl Language for Go {
             "type {} {}\n",
             self.acronyms_to_uppercase(&ty.id.original),
             self.format_type(&ty.r#type, &[])
-                .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?
+                .map_err(std::io::Error::other)?
         )?;
 
         Ok(())
@@ -207,7 +207,7 @@ impl Language for Go {
             RustConstExpr::Int(val) => {
                 let const_type = self
                     .format_type(&c.r#type, &[])
-                    .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?;
+                    .map_err(std::io::Error::other)?;
                 writeln!(
                     w,
                     "const {} {} = {}",
@@ -506,7 +506,7 @@ func ({short_name} {full_name}) MarshalJSON() ([]byte, error) {{
             Some(type_override) => type_override.to_owned(),
             None => self
                 .format_type(&field.ty, generic_types)
-                .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?,
+                .map_err(std::io::Error::other)?,
         };
 
         let go_type = self.acronyms_to_uppercase(&type_name);

core/src/language/go.rs

@@ -172,7 +172,7 @@ impl Language for Kotlin {
                     .then(|| format!("<{}>", ty.generic_types.join(", ")))
                     .unwrap_or_default(),
                 self.format_type(&ty.r#type, ty.generic_types.as_slice())
-                    .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?
+                    .map_err(std::io::Error::other)?
             )?;
         }
 
@@ -366,7 +366,7 @@ impl Kotlin {
                             )?;
                             let variant_type = self
                                 .format_type(ty, e.shared().generic_types.as_slice())
-                                .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?;
+                                .map_err(std::io::Error::other)?;
                             write!(w, "val {}: {}", content_key, variant_type)?;
                             write!(w, ")")?;
                         }
@@ -445,7 +445,7 @@ impl Kotlin {
             Some(type_override) => type_override.to_owned(),
             None => self
                 .format_type(&f.ty, generic_types)
-                .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?,
+                .map_err(std::io::Error::other)?,
         };
 
         match visibility {

core/src/language/kotlin.rs

@@ -354,7 +354,7 @@ pub trait Language {
     ///
     /// This function will write out:
     ///
-    /// ```compile_fail
+    /// ```rust
     /// /// Generated type representing the anonymous struct variant `<make_struct_name>` of the `AlgebraicEnum` rust enum
     /// /* the struct definition for whatever language */
     /// ```

core/src/language/mod.rs

@@ -273,7 +273,7 @@ impl Language for Python {
     fn write_type_alias(&mut self, w: &mut dyn Write, ty: &RustTypeAlias) -> std::io::Result<()> {
         let r#type = self
             .format_type(&ty.r#type, ty.generic_types.as_slice())
-            .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?;
+            .map_err(std::io::Error::other)?;
 
         writeln!(
             w,
@@ -295,7 +295,7 @@ impl Language for Python {
             RustConstExpr::Int(val) => {
                 let const_type = self
                     .format_type(&c.r#type, &[])
-                    .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?;
+                    .map_err(std::io::Error::other)?;
                 writeln!(
                     w,
                     "{}: {} = {}",
@@ -446,7 +446,7 @@ impl Python {
         let not_optional_but_default = !field.ty.is_optional() && field.has_default;
         let python_type = self
             .format_type(&field.ty, generic_types)
-            .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?;
+            .map_err(std::io::Error::other)?;
         let python_field_name = python_property_aware_rename(&field.id.original);
         let is_aliased = python_field_name != field.id.renamed;
         let custom_translations = json_translation_for_type(&python_type);
@@ -671,7 +671,7 @@ impl Python {
                 } => {
                     let tuple_name = self
                         .format_type(ty, shared.generic_types.as_slice())
-                        .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?;
+                        .map_err(std::io::Error::other)?;
                     self.write_variant_class(
                         &variant_class_name,
                         tag_key,

core/src/language/python.rs

@@ -151,7 +151,7 @@ impl Language for Scala {
                 .then(|| format!("[{}]", ty.generic_types.join(", ")))
                 .unwrap_or_default(),
             self.format_type(&ty.r#type, ty.generic_types.as_slice())
-                .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?
+                .map_err(std::io::Error::other)?
         )?;
 
         Ok(())
@@ -295,7 +295,7 @@ impl Scala {
                             )?;
                             let variant_type = self
                                 .format_type(ty, e.shared().generic_types.as_slice())
-                                .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?;
+                                .map_err(std::io::Error::other)?;
                             write!(w, "{}: {}", content_key, variant_type)?;
                             write!(w, ")")?;
                         }
@@ -370,7 +370,7 @@ impl Scala {
             Some(type_override) => type_override.to_owned(),
             None => self
                 .format_type(&f.ty, generic_types)
-                .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?,
+                .map_err(std::io::Error::other)?,
         };
 
         write!(