fix: update/query macro could not handle function arguments with the same name as the function itself

ic-cdk-macros/src/export.rs

@@ -81,14 +81,17 @@ fn get_args(method: MethodType, signature: &Signature) -> Result<Vec<(Ident, Box
  ));
  }
  FnArg::Typed(PatType { pat, ty, .. }) => {
- if let Pat::Ident(PatIdent { ident, .. }) = pat.as_ref() {
- (ident.clone(), ty.clone())
+ let ident = if let Pat::Ident(PatIdent { ident, .. }) = pat.as_ref() {
+ // If the argument is named the same as the function, we need to rename it.
+ if ident == &signature.ident {
+ format_ident!("__arg_{}", ident, span = pat.span())
+ } else {
+ ident.clone()
+ }
  } else {
- (
- format_ident!("__unnamed_arg_{i}", span = pat.span()),
- ty.clone(),
- )
- }
+ format_ident!("__unnamed_arg_{i}", span = pat.span())
+ };
+ (ident, ty.clone())
  }
  };
 

ic-cdk/CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [unreleased]
 
+### Fixed
+
+- Fix update/query macro could not handle function arguments with the same name as the function itself. (#525)
+
 ### Changed
 
 - Add `AllowedViewers` variant to `LogVisibility` enum. (#512)

ic-cdk/tests/pass/method_arg_same_name.rs

@@ -0,0 +1,13 @@
+use ic_cdk::{query, update};
+
+#[update]
+fn foo(foo: i32) -> i32 {
+ foo
+}
+
+#[query]
+fn bar(bar: i32) -> i32 {
+ bar
+}
+
+fn main() {}