From 43544a310942184464c0ac89503dc07588fc118d Mon Sep 17 00:00:00 2001 From: quexeky Date: Tue, 26 Aug 2025 10:47:00 +1000 Subject: [PATCH] fix: Incorrect variable usage in log::info! Signed-off-by: quexeky --- libraries/native_model/native_model_macro/src/lib.rs | 1 + .../native_model_macro/src/method/decode_upgrade_body.rs | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/libraries/native_model/native_model_macro/src/lib.rs b/libraries/native_model/native_model_macro/src/lib.rs index e46b6595..f4bce320 100644 --- a/libraries/native_model/native_model_macro/src/lib.rs +++ b/libraries/native_model/native_model_macro/src/lib.rs @@ -1,4 +1,5 @@ extern crate proc_macro; +extern crate log; mod method; diff --git a/libraries/native_model/native_model_macro/src/method/decode_upgrade_body.rs b/libraries/native_model/native_model_macro/src/method/decode_upgrade_body.rs index 2ca28162..7997ae83 100644 --- a/libraries/native_model/native_model_macro/src/method/decode_upgrade_body.rs +++ b/libraries/native_model/native_model_macro/src/method/decode_upgrade_body.rs @@ -7,15 +7,17 @@ pub(crate) fn generate_native_model_decode_upgrade_body(attrs: &ModelAttributes, let native_model_from = attrs.from.clone(); let native_model_try_from = attrs.try_from.clone(); + let name = struct_name.to_string(); + let model_from_or_try_from = if let Some(from) = native_model_from { quote! { - log::info!("Upgrading database {} from version {} to version {}", #struct_name, #from::native_model_version(), Self::native_model_version()); + ::log::info!("Upgrading database {} from version {} to version {}", #name, #from::native_model_version(), Self::native_model_version()); #from::native_model_decode_upgrade_body(data, id, version).map(|a| a.into()) } } else if let Some((try_from, error_try_from)) = native_model_try_from { quote! { - log::info!("Attempting to upgrade database {} from version {} to version {}", #struct_name, #try_from::native_model_version(), Self::native_model_version()); + ::log::info!("Attempting to upgrade database {} from version {} to version {}", #name, #try_from::native_model_version(), Self::native_model_version()); let result = #try_from::native_model_decode_upgrade_body(data, id, version).map(|b| { b.try_into() .map_err(|e: #error_try_from| native_model::UpgradeError {