Merge remote-tracking branch 'origin/master' into dp-remove-phantomdata

derive/src/lib.rs

@@ -90,7 +90,7 @@ fn generate_type(input: TokenStream2) -> Result<TokenStream2> {
         let ty_ident = &ty.ident;
         if !phantom_params.contains(ty_ident) {
             acc.push(quote! {
-                _scale_info::meta_type::<#ty_ident>()
+                ::scale_info::meta_type::<#ty_ident>()
             });
         }
         acc
@@ -264,7 +264,7 @@ fn generate_composite_type(data_struct: &DataStruct) -> (TokenStream2, Vec<Ident
         Fields::Unit => (quote! { unit() }, Vec::new()),
     };
     (
-        quote! { composite(_scale_info::build::Fields::#fields) },
+        quote! { composite(::scale_info::build::Fields::#fields) },
         phantom_params,
     )
 }
@@ -356,7 +356,7 @@ fn generate_variant_type(data_enum: &DataEnum) -> (TokenStream2, Vec<Ident>) {
     (
         quote! {
             variant(
-                _scale_info::build::Variants::with_fields()
+                ::scale_info::build::Variants::with_fields()
                     #( #variants)*
             )
         },

src/impls.rs

@@ -17,13 +17,11 @@ use crate::prelude::{
     collections::BTreeMap,
     marker::PhantomData,
     string::String,
-    vec,
     vec::Vec,
 };
 
 use crate::{
     build::*,
-    meta_type,
     MetaType,
     Path,
     Type,

test_suite/tests/codec.rs

@@ -16,18 +16,6 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![allow(dead_code)]
 
-#[cfg(not(feature = "std"))]
-extern crate alloc;
-
-#[cfg(not(feature = "std"))]
-use alloc::{
-    vec,
-    vec::Vec,
-};
-use core::{
-    marker::PhantomData,
-    num::NonZeroU32,
-};
 use pretty_assertions::{
     assert_eq,
     assert_ne,

test_suite/tests/derive.rs

@@ -13,12 +13,10 @@
 // limitations under the License.
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(not(feature = "std"))]
-extern crate alloc;
-
-#[cfg(not(feature = "std"))]
-use alloc::boxed::Box;
-use core::marker::PhantomData;
+use scale_info::prelude::{
+    marker::PhantomData,
+    boxed::Box,
+};
 
 use pretty_assertions::assert_eq;
 use scale_info::{