From dbfe2e876416c2dbd868af43d8fd7f6d451fef20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?dj8yf0=CE=BCl?= <feepdake27@gmail.com>
Date: Wed, 10 Jan 2024 21:53:38 +0200
Subject: [PATCH] ci: fix new 1.75 warnings

---
 near-contract-standards/src/fungible_token/mod.rs             | 1 -
 .../src/non_fungible_token/approval/mod.rs                    | 1 -
 near-contract-standards/src/non_fungible_token/mod.rs         | 2 --
 near-sdk-macros/src/core_impl/code_generator/attr_sig_info.rs | 2 +-
 near-sdk-macros/src/core_impl/code_generator/mod.rs           | 4 ----
 near-sdk/src/types/public_key.rs                              | 2 +-
 6 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/near-contract-standards/src/fungible_token/mod.rs b/near-contract-standards/src/fungible_token/mod.rs
index e81d68a20..eb0698fca 100644
--- a/near-contract-standards/src/fungible_token/mod.rs
+++ b/near-contract-standards/src/fungible_token/mod.rs
@@ -15,5 +15,4 @@ pub mod storage_impl;
 
 pub use crate::fungible_token::core::FungibleTokenCore;
 pub use core_impl::{Balance, FungibleToken};
-pub use macros::*;
 pub use resolver::FungibleTokenResolver;
diff --git a/near-contract-standards/src/non_fungible_token/approval/mod.rs b/near-contract-standards/src/non_fungible_token/approval/mod.rs
index e9648e86e..3bd2198a8 100644
--- a/near-contract-standards/src/non_fungible_token/approval/mod.rs
+++ b/near-contract-standards/src/non_fungible_token/approval/mod.rs
@@ -1,7 +1,6 @@
 mod approval_impl;
 mod approval_receiver;
 
-pub use approval_impl::*;
 pub use approval_receiver::*;
 
 use crate::non_fungible_token::token::TokenId;
diff --git a/near-contract-standards/src/non_fungible_token/mod.rs b/near-contract-standards/src/non_fungible_token/mod.rs
index 5bc8d4863..d8ee10547 100644
--- a/near-contract-standards/src/non_fungible_token/mod.rs
+++ b/near-contract-standards/src/non_fungible_token/mod.rs
@@ -20,8 +20,6 @@ pub use self::token::{Token, TokenId};
 mod utils;
 pub use utils::*;
 
-pub use macros::*;
-
 pub use self::approval::NonFungibleTokenApproval;
 pub use self::core::NonFungibleToken;
 pub use self::core::NonFungibleTokenResolver;
diff --git a/near-sdk-macros/src/core_impl/code_generator/attr_sig_info.rs b/near-sdk-macros/src/core_impl/code_generator/attr_sig_info.rs
index 974408dd3..c6bbf4215 100644
--- a/near-sdk-macros/src/core_impl/code_generator/attr_sig_info.rs
+++ b/near-sdk-macros/src/core_impl/code_generator/attr_sig_info.rs
@@ -307,7 +307,7 @@ impl AttrSigInfo {
     }
 }
 
-pub fn deserialize_data(ty: &SerializerType) -> TokenStream2 {
+fn deserialize_data(ty: &SerializerType) -> TokenStream2 {
     match ty {
         SerializerType::JSON => quote! {
             ::near_sdk::serde_json::from_slice(&data).expect("Failed to deserialize callback using JSON")
diff --git a/near-sdk-macros/src/core_impl/code_generator/mod.rs b/near-sdk-macros/src/core_impl/code_generator/mod.rs
index 112daedc4..94429cd1e 100644
--- a/near-sdk-macros/src/core_impl/code_generator/mod.rs
+++ b/near-sdk-macros/src/core_impl/code_generator/mod.rs
@@ -1,14 +1,10 @@
 mod attr_sig_info;
-pub use attr_sig_info::*;
 
 mod impl_item_method_info;
-pub use impl_item_method_info::*;
 
 mod item_trait_info;
-pub use item_trait_info::*;
 
 mod item_impl_info;
-pub use item_impl_info::*;
 
 pub(crate) mod ext;
 pub(crate) mod metadata;
diff --git a/near-sdk/src/types/public_key.rs b/near-sdk/src/types/public_key.rs
index 6eeb5c361..3266fe667 100644
--- a/near-sdk/src/types/public_key.rs
+++ b/near-sdk/src/types/public_key.rs
@@ -268,7 +268,7 @@ mod tests {
     #[test]
     fn test_public_key_to_string() {
         let key: PublicKey = expected_key();
-        let actual: String = String::try_from(&key).unwrap();
+        let actual: String = String::from(&key);
         assert_eq!(actual, "ed25519:6E8sCci9badyRkXb3JoRpBj5p8C6Tw41ELDZoiihKEtp");
     }