CombinedIdent: Revert From<Ident> implementation

Use associated function `from_rust_function` instead.
KDAB · Dec 7, 2022 · f0e8d45 · f0e8d45
1 parent 65fbd42
commit f0e8d45
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/crates/cxx-qt-gen/src/generator/naming/invokable.rs b/crates/cxx-qt-gen/src/generator/naming/invokable.rs
@@ -23,7 +23,7 @@ impl From<&ImplItemMethod> for QInvokableName {
     fn from(method: &ImplItemMethod) -> Self {
         let ident = &method.sig.ident;
         Self {
-            name: ident.clone().into(),
+            name: CombinedIdent::from_rust_function(ident.clone()),
             wrapper: wrapper_from_ident(ident),
         }
     }

diff --git a/crates/cxx-qt-gen/src/generator/naming/mod.rs b/crates/cxx-qt-gen/src/generator/naming/mod.rs
@@ -20,8 +20,8 @@ pub struct CombinedIdent {
     pub rust: Ident,
 }
 
-impl From<Ident> for CombinedIdent {
-    fn from(ident: Ident) -> Self {
+impl CombinedIdent {
+    pub fn from_rust_function(ident: Ident) -> Self {
         Self {
             cpp: format_ident!("{}", ident.to_string().to_case(Case::Camel)),
             rust: ident,

diff --git a/crates/cxx-qt-gen/src/parser/inherit.rs b/crates/cxx-qt-gen/src/parser/inherit.rs
@@ -46,7 +46,7 @@ impl ParsedInheritedMethod {
 
         let parameters = ParsedFunctionParameter::parse_all_without_receiver(&method.sig)?;
 
-        let mut ident = CombinedIdent::from(method.sig.ident.clone());
+        let mut ident = CombinedIdent::from_rust_function(method.sig.ident.clone());
         for attribute in &method.attrs {
             if !attribute.path.is_ident(&format_ident!("cxx_name")) {
                 return Err(Error::new(