Fix conversion of Call struct names to UpperCamelCase (#441)

* Fix conversion of `Call` struct names to UpperCamelCase

* Update to latest heck and use ToUpperCamelCase
This commit is contained in:
Andrew Jones
2022-02-10 13:10:27 +00:00
committed by GitHub
parent a7c54f7412
commit 4bed7eb716
6 changed files with 9 additions and 9 deletions
+1 -1
View File
@@ -15,7 +15,7 @@ async-trait = "0.1.49"
codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive", "full", "bit-vec"] } codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive", "full", "bit-vec"] }
darling = "0.13.0" darling = "0.13.0"
frame-metadata = "14.0" frame-metadata = "14.0"
heck = "0.3.2" heck = "0.4.0"
proc-macro2 = "1.0.24" proc-macro2 = "1.0.24"
proc-macro-crate = "0.1.5" proc-macro-crate = "0.1.5"
proc-macro-error = "1.0.4" proc-macro-error = "1.0.4"
+3 -3
View File
@@ -23,8 +23,8 @@ use frame_metadata::{
PalletMetadata, PalletMetadata,
}; };
use heck::{ use heck::{
CamelCase as _, ToSnakeCase as _,
SnakeCase as _, ToUpperCamelCase as _,
}; };
use proc_macro2::TokenStream as TokenStream2; use proc_macro2::TokenStream as TokenStream2;
use proc_macro_error::abort_call_site; use proc_macro_error::abort_call_site;
@@ -43,7 +43,7 @@ pub fn generate_calls(
let struct_defs = super::generate_structs_from_variants( let struct_defs = super::generate_structs_from_variants(
type_gen, type_gen,
call.ty.id(), call.ty.id(),
|name| name.to_camel_case().into(), |name| name.to_upper_camel_case().into(),
"Call", "Call",
); );
let (call_structs, call_fns): (Vec<_>, Vec<_>) = struct_defs let (call_structs, call_fns): (Vec<_>, Vec<_>) = struct_defs
+1 -1
View File
@@ -16,7 +16,7 @@
use crate::types::TypeGenerator; use crate::types::TypeGenerator;
use frame_metadata::PalletConstantMetadata; use frame_metadata::PalletConstantMetadata;
use heck::SnakeCase as _; use heck::ToSnakeCase as _;
use proc_macro2::TokenStream as TokenStream2; use proc_macro2::TokenStream as TokenStream2;
use quote::{ use quote::{
format_ident, format_ident,
+2 -2
View File
@@ -54,7 +54,7 @@ use frame_metadata::{
RuntimeMetadataPrefixed, RuntimeMetadataPrefixed,
StorageEntryType, StorageEntryType,
}; };
use heck::SnakeCase as _; use heck::ToSnakeCase as _;
use proc_macro2::TokenStream as TokenStream2; use proc_macro2::TokenStream as TokenStream2;
use proc_macro_error::abort_call_site; use proc_macro_error::abort_call_site;
use quote::{ use quote::{
@@ -462,7 +462,7 @@ where
type_gen, type_gen,
); );
CompositeDef::struct_def( CompositeDef::struct_def(
var.name(), struct_name.as_ref(),
Default::default(), Default::default(),
fields, fields,
Some(parse_quote!(pub)), Some(parse_quote!(pub)),
+1 -1
View File
@@ -23,7 +23,7 @@ use frame_metadata::{
StorageEntryType, StorageEntryType,
StorageHasher, StorageHasher,
}; };
use heck::SnakeCase as _; use heck::ToSnakeCase as _;
use proc_macro2::TokenStream as TokenStream2; use proc_macro2::TokenStream as TokenStream2;
use proc_macro_error::abort_call_site; use proc_macro_error::abort_call_site;
use quote::{ use quote::{
+1 -1
View File
@@ -19,7 +19,7 @@ async-trait = "0.1.49"
codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive", "full"] } codec = { package = "parity-scale-codec", version = "2", default-features = false, features = ["derive", "full"] }
darling = "0.13.0" darling = "0.13.0"
frame-metadata = "14.0" frame-metadata = "14.0"
heck = "0.3.2" heck = "0.4.0"
proc-macro2 = "1.0.24" proc-macro2 = "1.0.24"
proc-macro-crate = "0.1.5" proc-macro-crate = "0.1.5"
proc-macro-error = "1.0.4" proc-macro-error = "1.0.4"