Merge remote-tracking branch 'upstream/main' into dpezely/subtype-naming

Author: dpezely

Cargo.lock

@@ -16,9 +16,9 @@ typify = { version = "0.5.0", path = "typify" }
 typify-impl = { version = "0.5.0", path = "typify-impl" }
 typify-macro = { version = "0.5.0", path = "typify-macro" }
 
-assert_cmd = "2.1.1"
+assert_cmd = "2.1.2"
 chrono = { version = "0.4.42", features = ["serde"] }
-clap = { version = "4.5.53", features = ["derive"] }
+clap = { version = "4.5.54", features = ["derive"] }
 color-eyre = "0.6"
 env_logger = "0.11"
 expectorate = "1.2.0"
@@ -29,16 +29,16 @@ log = "0.4.29"
 newline-converter = "0.3.0"
 paste = "1.0.15"
 prettyplease = "0.2.37"
-proc-macro2 = "1.0.103"
-quote = "1.0.42"
+proc-macro2 = "1.0.105"
+quote = "1.0.43"
 regress = "0.10.5"
 rustfmt-wrapper = "0.2.1"
 schema = "0.1.0"
 schemars = "0.8.22"
 semver = "1.0.27"
 serde = "1.0.228"
-serde_json = "1.0.146"
-syn = { version = "2.0.111", features = ["full"] }
+serde_json = "1.0.149"
+syn = { version = "2.0.114", features = ["full"] }
 tempdir = "0.3.7"
 thiserror = "2.0.17"
 trybuild = "1.0.114"

Cargo.toml

@@ -72,11 +72,6 @@ pub enum IdOrName {
     Id(uuid::Uuid),
     Name(Name),
 }
-impl From<&IdOrName> for IdOrName {
-    fn from(value: &IdOrName) -> Self {
-        value.clone()
-    }
-}
 impl std::str::FromStr for IdOrName {
     type Err = &'static str;
     fn from_str(value: &str) -> Result<Self, &'static str> {
@@ -95,12 +90,6 @@ impl std::convert::TryFrom<&str> for IdOrName {
         value.parse()
     }
 }
-impl std::convert::TryFrom<&String> for IdOrName {
-    type Error = &'static str;
-    fn try_from(value: &String) -> Result<Self, &'static str> {
-        value.parse()
-    }
-}
 impl std::convert::TryFrom<String> for IdOrName {
     type Error = &'static str;
     fn try_from(value: String) -> Result<Self, &'static str> {
@@ -139,11 +128,6 @@ impl From<Name> for String {
         value.0
     }
 }
-impl From<&Name> for Name {
-    fn from(value: &Name) -> Self {
-        value.clone()
-    }
-}
 impl std::str::FromStr for Name {
     type Err = &'static str;
     fn from_str(value: &str) -> Result<Self, &'static str> {
@@ -166,12 +150,6 @@ impl std::convert::TryFrom<&str> for Name {
         value.parse()
     }
 }
-impl std::convert::TryFrom<&String> for Name {
-    type Error = &'static str;
-    fn try_from(value: &String) -> Result<Self, &'static str> {
-        value.parse()
-    }
-}
 impl std::convert::TryFrom<String> for Name {
     type Error = &'static str;
     fn try_from(value: String) -> Result<Self, &'static str> {
@@ -204,5 +182,8 @@ default). Builder output lets you write code like this:
 let xy: MyStruct = MyStruct::builder().x_coord(x).y_coord(y).try_into();
 ```
 
-The `--additional-derive` adds the specified derive macro to all generated
-types. This may be specified more than once.
+The `--additional-derive` option adds the specified derive macro to all generated
+types. This may be specified more than once.
+
+The `--additional-attr` option adds the specified attribute to all generated
+types. This may be specified more than once.

cargo-typify/README.md

@@ -31,9 +31,13 @@ pub struct CliArgs {
     pub no_builder: bool,
 
     /// Add an additional derive macro to apply to all defined types.
-    #[arg(short, long = "additional-derive", value_name = "derive")]
+    #[arg(short = 'd', long = "additional-derive", value_name = "derive")]
     pub additional_derives: Vec<String>,
 
+    /// Add an additional attribute to apply to all defined types.
+    #[arg(short = 'a', long = "additional-attr", value_name = "attr")]
+    pub additional_attrs: Vec<String>,
+
     /// The output file to write to. If not specified, the input file name will
     /// be used with a `.rs` extension.
     ///
@@ -146,6 +150,10 @@ pub fn convert(args: &CliArgs) -> Result<String> {
         settings.with_derive(derive.clone());
     }
 
+    for attr in &args.additional_attrs {
+        settings.with_attr(attr.clone());
+    }
+
     for CrateSpec {
         name,
         version,
@@ -197,6 +205,7 @@ mod tests {
             input: PathBuf::from("input.json"),
             builder: false,
             additional_derives: vec![],
+            additional_attrs: vec![],
             output: Some(PathBuf::from("-")),
             no_builder: false,
             crates: vec![],
@@ -213,6 +222,7 @@ mod tests {
             input: PathBuf::from("input.json"),
             builder: false,
             additional_derives: vec![],
+            additional_attrs: vec![],
             output: Some(PathBuf::from("some_file.rs")),
             no_builder: false,
             crates: vec![],
@@ -229,6 +239,7 @@ mod tests {
             input: PathBuf::from("input.json"),
             builder: false,
             additional_derives: vec![],
+            additional_attrs: vec![],
             output: None,
             no_builder: false,
             crates: vec![],
@@ -245,6 +256,7 @@ mod tests {
             input: PathBuf::from("input.json"),
             builder: false,
             additional_derives: vec![],
+            additional_attrs: vec![],
             output: None,
             no_builder: false,
             crates: vec![],
@@ -264,6 +276,7 @@ mod tests {
             input: PathBuf::from("input.json"),
             builder: false,
             additional_derives: vec![],
+            additional_attrs: vec![],
             output: None,
             no_builder: false,
             crates: vec![],
@@ -280,6 +293,7 @@ mod tests {
             input: PathBuf::from("input.json"),
             builder: false,
             additional_derives: vec![],
+            additional_attrs: vec![],
             output: None,
             no_builder: true,
             crates: vec![],
@@ -296,6 +310,7 @@ mod tests {
             input: PathBuf::from("input.json"),
             builder: true,
             additional_derives: vec![],
+            additional_attrs: vec![],
             output: None,
             no_builder: false,
             crates: vec![],