upgrade rustc-version: 1.85 and edition "2024"

Author: pollenjp

Cargo.toml

@@ -1,11 +1,11 @@
 [workspace]
 members = ["crates/*", "examples/*"]
-resolver = "2"
+resolver = "3"
 
 [workspace.package]
 version = "0.0.13"
-edition = "2021"
-rust-version = "1.83"
+edition = "2024"
+rust-version = "1.85"
 description = "cdk-ansible is a tool to generate Ansible playbooks from Rust code."
 homepage = "https://github.com/pollenjp/cdk-ansible"
 documentation = "https://docs.rs/cdk-ansible"

crates/cdk-ansible-cli/Cargo.toml

@@ -41,6 +41,11 @@ anyhow.workspace = true
 regex.workspace = true
 fs-err.workspace = true
 
+[lints.rust]
+# clippy::redundant_pub_crate conflicts with rustc::unreachable_pub #5369
+# https://github.com/rust-lang/rust-clippy/issues/5369
+# unreachable-pub = "warn"
+
 [lints.clippy]
 
 # category
@@ -62,16 +67,19 @@ branches_sharing_code = "allow"
 #
 # https://rust-lang.github.io/rust-clippy/master/index.html#blanket_clippy_restriction_lints
 blanket_clippy_restriction_lints = "allow"
+absolute_paths = "allow"
 arbitrary_source_item_ordering = "allow"
 implicit_return = "allow"
 min_ident_chars = "allow"
 missing_docs_in_private_items = "allow"
 mod_module_files = "allow"
 # FIXME: later
 print_stdout = "allow"
+pub_with_shorthand = "allow"
 question_mark_used = "allow"
 self_named_module_files = "allow"
 shadow_reuse = "allow"
 shadow_same = "allow"
 shadow_unrelated = "allow"
+single_call_fn = "allow"
 single_char_lifetime_names = "allow"

crates/cdk-ansible-cli/src/arg.rs

@@ -1,9 +1,10 @@
+use crate::version;
 use cdk_ansible_static::EnvVars;
 use clap::{command, Args, Parser, Subcommand, ValueEnum};
 use std::path::PathBuf;
 
 #[derive(Parser)]
-#[command(name = "cdk-ansible", author, long_version = crate::version::version().to_string())]
+#[command(name = "cdk-ansible", author, long_version = version::version().to_string())]
 #[command(about = ".")]
 #[command(propagate_version = true)]
 #[command(

crates/cdk-ansible-cli/src/bin/cdk-ansible.rs

@@ -1,8 +1,7 @@
 use anyhow::Result;
 use cdk_ansible_cli::run;
-use std::env;
 
 fn main() -> Result<()> {
-    run(env::args_os())?;
+    run(std::env::args_os())?;
     Ok(())
 }

crates/cdk-ansible-cli/src/lib.rs

@@ -81,7 +81,6 @@ impl FilesystemOptions {
 /// Use [`anyhow::Result`] to handle errors.
 ///
 #[inline]
-// #[expect(clippy::single_call_fn, reason = "better readability")]
 pub fn run<I, T>(args: I) -> Result<()>
 where
     I: IntoIterator<Item = T>,

crates/cdk-ansible-cli/src/settings.rs

@@ -55,7 +55,6 @@ pub struct ModuleSettings {
 
 impl ModuleSettings {
     /// Convert the command line arguments to the settings
-    #[expect(clippy::single_call_fn, reason = "better readability")]
     pub fn resolve(args: arg::ModuleArgs) -> Self {
         Self {
             output_dir: args.output_dir,

crates/cdk-ansible-cli/src/subcommand/module.rs

@@ -1,6 +1,6 @@
 use crate::arg::ModuleArgs;
 use crate::settings::{ModuleSettings, PkgUnit};
-use anyhow::{bail, Context as _, Result};
+use anyhow::{Context as _, Result, bail};
 use core::fmt;
 use indexmap::IndexMap;
 use quote::{format_ident, quote};
@@ -29,13 +29,14 @@ static SUB_MOD_NAME: &str = "m";
 ///
 /// * `CliError` - If the command line arguments are invalid.
 /// * `IoError` - If the configuration file is not found or cannot be read.
-#[expect(clippy::single_call_fn, reason = "better readability")]
 pub fn module(args: ModuleArgs) -> Result<()> {
     let args = ModuleSettings::resolve(args);
     let ans_modu_names = match (args.module_name, args.module_name_regex) {
         (Some(modu_name), None) => {
-            vec![AnsibleModuleName::new(&modu_name)
-                .with_context(|| format!("failed to parse module name: {modu_name}"))?]
+            vec![
+                AnsibleModuleName::new(&modu_name)
+                    .with_context(|| format!("failed to parse module name: {modu_name}"))?,
+            ]
         }
         (None, Some(regex)) => match_module_name(&regex)?,
         (None, None) => match_module_name("*")?,
@@ -310,8 +311,8 @@ fn create_cargo_toml(pkg_name: &str, pkg_dir: &Path) -> Result<()> {
         [package]
         name = "sample"
         version = "0.1.0"
-        edition = "2021"
-        rust-version = "1.83"
+        edition.workspace = true
+        rust-version.workspace = true
         "#,
     )?;
     if let Some(package) = manifest.package.as_mut() {
@@ -521,21 +522,21 @@ type AnsModuleJson = IndexMap<String, AnsModuleItem>;
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 /// module field
-pub struct AnsModuleItem {
+struct AnsModuleItem {
     /// 'doc' field
     pub doc: AnsModuleDoc,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 /// doc field
-pub struct AnsModuleDoc {
+struct AnsModuleDoc {
     /// 'options' field
     pub options: Option<IndexMap<String, AnsModuleDocOption>>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 /// doc option field
-pub struct AnsModuleDocOption {
+struct AnsModuleDocOption {
     // TODO: add description field
     // #[serde(default)]
     // pub description: Vec<String>,

crates/cdk-ansible-macro/src/lib.rs

@@ -70,12 +70,12 @@ pub fn attribute_env_vars_metadata(_attr: TokenStream, input: TokenStream) -> To
             }
             ImplItem::Fn(item) if !is_hidden(&item.attrs) => {
                 // Extract the environment variable patterns.
-                if let Some(pattern) = get_env_var_pattern_from_attr(&item.attrs) {
+                match get_env_var_pattern_from_attr(&item.attrs) { Some(pattern) => {
                     let doc = get_doc_comment(&item.attrs);
                     Some((pattern, doc))
-                } else {
+                } _ => {
                     None // Skip if pattern extraction fails.
-                }
+                }}
             }
             _ => None,
         })

examples/cdkam_ansible/Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "cdkam_ansible"
 version = "0.1.0"
-edition = "2021"
-rust-version = "1.83"
+edition.workspace = true
+rust-version.workspace = true
 
 [dependencies]
 anyhow = "1.0.95"