Merge branch 'master' into jg/frame-crate-path

substrate/frame/support/procedural/src/lib.rs

@@ -34,7 +34,7 @@ mod transactional;
 mod tt_macro;
 
 use frame_support_procedural_tools::generate_crate_access_from_frame_or_deps;
-use macro_magic::import_tokens_attr;
+use macro_magic::{import_tokens_attr, import_tokens_attr_verbatim};
 use proc_macro::TokenStream;
 use quote::{quote, ToTokens};
 use std::{cell::RefCell, str::FromStr};

substrate/frame/support/procedural/src/storage_alias.rs

@@ -17,7 +17,7 @@
 
 //! Implementation of the `storage_alias` attribute macro.
 
-use crate::counter_prefix;
+use crate::{counter_prefix, pallet::parse::helper};
 use frame_support_procedural_tools::generate_crate_access_from_frame_or_deps;
 use proc_macro2::{Span, TokenStream};
 use quote::{quote, ToTokens};