lang: Improve std hygiene inside macros

Author: acheroncrypto

lang/attribute/account/src/lib.rs

@@ -268,7 +268,7 @@ pub fn account(
 
                 #[automatically_derived]
                 impl #impl_gen anchor_lang::AccountSerialize for #account_name #type_gen #where_clause {
-                    fn try_serialize<W: std::io::Write>(&self, writer: &mut W) -> anchor_lang::Result<()> {
+                    fn try_serialize<W: ::std::io::Write>(&self, writer: &mut W) -> anchor_lang::Result<()> {
                         if writer.write_all(#disc).is_err() {
                             return Err(anchor_lang::error::ErrorCode::AccountDidNotSerialize.into());
                         }

lang/attribute/program/src/declare_program/mods/accounts.rs

@@ -38,7 +38,7 @@ pub fn gen_accounts_mod(idl: &Idl) -> proc_macro2::TokenStream {
             match ty_def.serialization {
                 IdlSerialization::Borsh => quote! {
                     impl anchor_lang::AccountSerialize for #name {
-                        fn try_serialize<W: std::io::Write>(&self, writer: &mut W) -> anchor_lang::Result<()> {
+                        fn try_serialize<W: ::std::io::Write>(&self, writer: &mut W) -> anchor_lang::Result<()> {
                             if writer.write_all(#disc).is_err() {
                                 return Err(anchor_lang::error::ErrorCode::AccountDidNotSerialize.into());
                             }

lang/attribute/program/src/declare_program/mods/cpi.rs

@@ -57,7 +57,7 @@ fn gen_cpi_instructions(idl: &Idl) -> proc_macro2::TokenStream {
                     quote! { anchor_lang::Result<Return::<#ty>> },
                     quote! {
                         Ok(Return::<#ty> {
-                            phantom: std::marker::PhantomData,
+                            phantom: ::std::marker::PhantomData,
                             program_id: ctx.program_id,
                             return_data: anchor_lang::__private::CpiReturnData::snapshot(),
                         })
@@ -112,7 +112,7 @@ fn gen_cpi_return_type() -> proc_macro2::TokenStream {
     quote! {
         #[derive(Debug, Clone, Copy)]
         pub struct Return<T> {
-            phantom: std::marker::PhantomData<T>,
+            phantom: ::std::marker::PhantomData<T>,
             program_id: anchor_lang::solana_program::pubkey::Pubkey,
             return_data: anchor_lang::__private::CpiReturnData,
         }

lang/syn/src/codegen/accounts/try_accounts.rs

@@ -251,7 +251,7 @@ pub fn generate(accs: &AccountsStruct) -> proc_macro2::TokenStream {
                 __accounts: &mut &#trait_generics [anchor_lang::solana_program::account_info::AccountInfo<#trait_generics>],
                 __ix_data: &[u8],
                 __bumps: &mut #bumps_struct_name,
-                __reallocs: &mut std::collections::BTreeSet<anchor_lang::solana_program::pubkey::Pubkey>,
+                __reallocs: &mut ::std::collections::BTreeSet<anchor_lang::solana_program::pubkey::Pubkey>,
             ) -> anchor_lang::Result<Self> {
                 // Deserialize instruction, if declared.
                 #ix_de
@@ -412,7 +412,7 @@ fn generate_duplicate_mutable_checks(accs: &AccountsStruct) -> proc_macro2::Toke
     quote! {
         // Duplicate mutable account validation - using HashSet
         {
-            let mut __mutable_accounts = std::collections::HashSet::new();
+            let mut __mutable_accounts = ::std::collections::HashSet::new();
 
             // Check declared mutable accounts for duplicates among themselves
             #(

lang/syn/src/codegen/error.rs

@@ -21,7 +21,7 @@ pub fn generate(error: Error) -> proc_macro2::TokenStream {
             let display_msg = match &error_code.msg {
                 None => {
                     quote! {
-                        <Self as std::fmt::Debug>::fmt(self, fmt)
+                        <Self as ::std::fmt::Debug>::fmt(self, fmt)
                     }
                 }
                 Some(msg) => {
@@ -60,7 +60,7 @@ pub fn generate(error: Error) -> proc_macro2::TokenStream {
     };
 
     let ret = quote! {
-        #[derive(std::fmt::Debug, Clone, Copy)]
+        #[derive(::std::fmt::Debug, Clone, Copy)]
         #[repr(u32)]
         #error_enum
 
@@ -93,8 +93,8 @@ pub fn generate(error: Error) -> proc_macro2::TokenStream {
             }
         }
 
-        impl std::fmt::Display for #enum_name {
-            fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::result::Result<(), std::fmt::Error> {
+        impl ::std::fmt::Display for #enum_name {
+            fn fmt(&self, fmt: &mut ::std::fmt::Formatter<'_>) -> ::std::result::Result<(), ::std::fmt::Error> {
                 match self {
                     #(#display_variant_dispatch),*
                 }

lang/syn/src/codegen/program/cpi.rs

@@ -93,12 +93,12 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream {
         #[cfg(feature = "cpi")]
         pub mod cpi {
             use super::*;
-            use std::marker::PhantomData;
+            use ::std::marker::PhantomData;
 
 
             #[derive(Debug, Clone, Copy)]
             pub struct Return<T> {
-                phantom: std::marker::PhantomData<T>,
+                phantom: ::std::marker::PhantomData<T>,
                 program_id: anchor_lang::solana_program::pubkey::Pubkey,
                 return_data: anchor_lang::__private::CpiReturnData,
             }

lang/syn/src/codegen/program/handlers.rs

@@ -121,7 +121,7 @@ pub fn generate(program: &Program) -> proc_macro2::TokenStream {
                     // Bump collector.
                     let mut __bumps = <#accounts_struct_name as anchor_lang::Bumps>::Bumps::default();
 
-                    let mut __reallocs = std::collections::BTreeSet::new();
+                    let mut __reallocs = ::std::collections::BTreeSet::new();
 
                     // Deserialize accounts.
                     let mut __remaining_accounts = __accounts;
@@ -218,55 +218,55 @@ fn generate_legacy_idl_mod() -> proc_macro2::TokenStream {
             match ix {
                 anchor_lang::idl::IdlInstruction::Create { data_len } => {
                     let mut bumps = <IdlCreateAccounts as anchor_lang::Bumps>::Bumps::default();
-                    let mut reallocs = std::collections::BTreeSet::new();
+                    let mut reallocs = ::std::collections::BTreeSet::new();
                     let mut accounts =
                         IdlCreateAccounts::try_accounts(program_id, &mut accounts, &[], &mut bumps, &mut reallocs)?;
                     __idl_create_account(program_id, &mut accounts, data_len)?;
                     accounts.exit(program_id)?;
                 },
                 anchor_lang::idl::IdlInstruction::Resize { data_len } => {
                     let mut bumps = <IdlResizeAccount as anchor_lang::Bumps>::Bumps::default();
-                    let mut reallocs = std::collections::BTreeSet::new();
+                    let mut reallocs = ::std::collections::BTreeSet::new();
                     let mut accounts =
                         IdlResizeAccount::try_accounts(program_id, &mut accounts, &[], &mut bumps, &mut reallocs)?;
                     __idl_resize_account(program_id, &mut accounts, data_len)?;
                     accounts.exit(program_id)?;
                 },
                 anchor_lang::idl::IdlInstruction::Close => {
                     let mut bumps = <IdlCloseAccount as anchor_lang::Bumps>::Bumps::default();
-                    let mut reallocs = std::collections::BTreeSet::new();
+                    let mut reallocs = ::std::collections::BTreeSet::new();
                     let mut accounts =
                         IdlCloseAccount::try_accounts(program_id, &mut accounts, &[], &mut bumps, &mut reallocs)?;
                     __idl_close_account(program_id, &mut accounts)?;
                     accounts.exit(program_id)?;
                 },
                 anchor_lang::idl::IdlInstruction::CreateBuffer => {
                     let mut bumps = <IdlCreateBuffer as anchor_lang::Bumps>::Bumps::default();
-                    let mut reallocs = std::collections::BTreeSet::new();
+                    let mut reallocs = ::std::collections::BTreeSet::new();
                     let mut accounts =
                         IdlCreateBuffer::try_accounts(program_id, &mut accounts, &[], &mut bumps, &mut reallocs)?;
                     __idl_create_buffer(program_id, &mut accounts)?;
                     accounts.exit(program_id)?;
                 },
                 anchor_lang::idl::IdlInstruction::Write { data } => {
                     let mut bumps = <IdlAccounts as anchor_lang::Bumps>::Bumps::default();
-                    let mut reallocs = std::collections::BTreeSet::new();
+                    let mut reallocs = ::std::collections::BTreeSet::new();
                     let mut accounts =
                         IdlAccounts::try_accounts(program_id, &mut accounts, &[], &mut bumps, &mut reallocs)?;
                     __idl_write(program_id, &mut accounts, data)?;
                     accounts.exit(program_id)?;
                 },
                 anchor_lang::idl::IdlInstruction::SetAuthority { new_authority } => {
                     let mut bumps = <IdlAccounts as anchor_lang::Bumps>::Bumps::default();
-                    let mut reallocs = std::collections::BTreeSet::new();
+                    let mut reallocs = ::std::collections::BTreeSet::new();
                     let mut accounts =
                         IdlAccounts::try_accounts(program_id, &mut accounts, &[], &mut bumps, &mut reallocs)?;
                     __idl_set_authority(program_id, &mut accounts, new_authority)?;
                     accounts.exit(program_id)?;
                 },
                 anchor_lang::idl::IdlInstruction::SetBuffer => {
                     let mut bumps = <IdlSetBuffer as anchor_lang::Bumps>::Bumps::default();
-                    let mut reallocs = std::collections::BTreeSet::new();
+                    let mut reallocs = ::std::collections::BTreeSet::new();
                     let mut accounts =
                         IdlSetBuffer::try_accounts(program_id, &mut accounts, &[], &mut bumps, &mut reallocs)?;
                     __idl_set_buffer(program_id, &mut accounts)?;

lang/syn/src/codegen/program/idl.rs

@@ -107,7 +107,7 @@ pub fn idl_accounts_and_functions() -> proc_macro2::TokenStream {
         }
 
 
-        use std::cell::{Ref, RefMut};
+        use ::std::cell::{Ref, RefMut};
 
         pub trait IdlTrailingData<'info> {
             fn trailing_data(self) -> Ref<'info, [u8]>;
@@ -147,7 +147,7 @@ pub fn idl_accounts_and_functions() -> proc_macro2::TokenStream {
             let owner = accounts.program.key;
             let to = Pubkey::create_with_seed(&base, seed, owner).unwrap();
             // Space: account discriminator || authority pubkey || vec len || vec data
-            let space = std::cmp::min(
+            let space = ::std::cmp::min(
                 IdlAccount::DISCRIMINATOR.len() + 32 + 4 + data_len as usize,
                 10_000
             );
@@ -189,7 +189,7 @@ pub fn idl_accounts_and_functions() -> proc_macro2::TokenStream {
             // Store the new account data.
             let mut data = accounts.to.try_borrow_mut_data()?;
             let dst: &mut [u8] = &mut data;
-            let mut cursor = std::io::Cursor::new(dst);
+            let mut cursor = ::std::io::Cursor::new(dst);
             idl_account.try_serialize(&mut cursor)?;
 
             Ok(())
@@ -213,7 +213,7 @@ pub fn idl_accounts_and_functions() -> proc_macro2::TokenStream {
             }
 
             let idl_ref = AsRef::<AccountInfo>::as_ref(&accounts.idl);
-            let new_account_space = idl_ref.data_len().checked_add(std::cmp::min(
+            let new_account_space = idl_ref.data_len().checked_add(::std::cmp::min(
                 data_len
                     .checked_sub(idl_ref.data_len())
                     .expect("data_len should always be >= the current account space"),

lang/syn/src/idl/accounts.rs

@@ -144,8 +144,8 @@ pub fn gen_idl_build_impl_accounts_struct(accounts: &AccountsStruct) -> TokenStr
     quote! {
         impl #impl_generics #ident #ty_generics #where_clause {
             pub fn __anchor_private_gen_idl_accounts(
-                accounts: &mut std::collections::BTreeMap<String, #idl::IdlAccount>,
-                types: &mut std::collections::BTreeMap<String, #idl::IdlTypeDef>,
+                accounts: &mut ::std::collections::BTreeMap<String, #idl::IdlAccount>,
+                types: &mut ::std::collections::BTreeMap<String, #idl::IdlTypeDef>,
             ) -> Vec<#idl::IdlInstructionAccountItem> {
                 #(
                     if let Some(ty) = <#defined>::create_type() {

lang/syn/src/idl/defined.rs

@@ -59,7 +59,7 @@ fn impl_idl_build(
             }
 
             fn insert_types(
-                types: &mut std::collections::BTreeMap<String, #idl::IdlTypeDef>
+                types: &mut ::std::collections::BTreeMap<String, #idl::IdlTypeDef>
             ) {
                 #insert_defined
             }