alloc feature removed from codec, cleanup

contracts/feature-tests/alloc-features/src/echo_alloc.rs

@@ -2,9 +2,6 @@ multiversx_sc::imports!();
 
 use crate::types::*;
 
-// String is not part of the standard imports because we want to discourage its use
-use multiversx_sc::types::String;
-
 /// Test serialization for heap-allocated types.
 #[multiversx_sc::module]
 pub trait EchoAllocTypes {

contracts/feature-tests/alloc-features/src/macro_features_legacy.rs

@@ -2,8 +2,6 @@
 
 multiversx_sc::imports!();
 
-use multiversx_sc::types::String;
-
 /// Legacy, deprecated macros. Will b removed once they get removed.
 ///
 /// Error conversions should be moved to corresponding new formatter-based error tests.

data/codec/Cargo.toml

@@ -15,7 +15,6 @@ categories = ["no-std", "wasm", "cryptography::cryptocurrencies", "development-t
 
 [features]
 derive = ["multiversx-sc-codec-derive"]
-alloc = []
 
 [dependencies.multiversx-sc-codec-derive]
 path = "../codec-derive"

data/codec/src/multi_types/mod.rs

@@ -3,14 +3,10 @@ mod multi_value_optional;
 mod multi_value_placeholder;
 mod multi_value_tuple;
 mod multi_value_unit;
-
-#[cfg(feature = "alloc")]
 mod multi_value_vec;
 
 pub use multi_value_ignore::IgnoreValue;
 pub use multi_value_optional::OptionalValue;
 pub use multi_value_placeholder::*;
 pub use multi_value_tuple::*;
-
-#[cfg(feature = "alloc")]
 pub use multi_value_vec::MultiValueVec;

framework/base/Cargo.toml

@@ -18,7 +18,7 @@ all-features = true
 
 [features]
 num-bigint = ["multiversx-sc-codec/num-bigint"]
-alloc = ["multiversx-sc-codec/alloc"]
+alloc = []
 managed-buffer-builder-cached = []
 esdt-token-payment-legacy-decode = []
 

framework/base/src/abi/type_abi_impl_codec_multi.rs

@@ -5,15 +5,13 @@ use crate::{
     codec::multi_types::{IgnoreValue, OptionalValue},
 };
 
-#[cfg(feature = "alloc")]
 impl<T, U> TypeAbiFrom<crate::codec::multi_types::MultiValueVec<U>>
     for crate::codec::multi_types::MultiValueVec<T>
 where
     T: TypeAbiFrom<U>,
 {
 }
 
-#[cfg(feature = "alloc")]
 impl<T: TypeAbi> TypeAbi for crate::codec::multi_types::MultiValueVec<T> {
     type Unmanaged = crate::codec::multi_types::MultiValueVec<T::Unmanaged>;
 

framework/base/src/types/managed/basic/managed_buffer.rs

@@ -514,7 +514,6 @@ impl<M: ManagedTypeApi> core::fmt::Debug for ManagedBuffer<M> {
     }
 }
 
-#[cfg(feature = "alloc")]
 impl<M: ManagedTypeApi> core::fmt::Display for ManagedBuffer<M> {
     fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
         use crate::contract_base::ErrorHelper;

framework/base/src/types/managed/multi_value/multi_value_encoded.rs

@@ -1,5 +1,6 @@
 use unwrap_infallible::UnwrapInfallible;
 
+use crate::codec::multi_types::MultiValueVec;
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::{ErrorApi, ManagedTypeApi},
@@ -244,12 +245,8 @@ where
     M: ManagedTypeApi,
     T: TypeAbi,
 {
-    #[cfg(feature = "alloc")]
     type Unmanaged = MultiValueVec<T::Unmanaged>;
 
-    #[cfg(not(feature = "alloc"))]
-    type Unmanaged = Self;
-
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()
     }
@@ -267,10 +264,6 @@ where
     }
 }
 
-#[cfg(feature = "alloc")]
-use crate::codec::multi_types::MultiValueVec;
-
-#[cfg(feature = "alloc")]
 impl<M, T, U> TypeAbiFrom<MultiValueVec<T>> for MultiValueEncoded<M, U>
 where
     M: ManagedTypeApi + ErrorApi,
@@ -279,7 +272,6 @@ where
 {
 }
 
-#[cfg(feature = "alloc")]
 impl<M, T, U> TypeAbiFrom<MultiValueEncoded<M, T>> for MultiValueVec<U>
 where
     M: ManagedTypeApi + ErrorApi,

framework/base/src/types/managed/multi_value/multi_value_managed_vec.rs

@@ -1,3 +1,5 @@
+use multiversx_sc_codec::multi_types::MultiValueVec;
+
 use crate::{
     abi::{TypeAbi, TypeAbiFrom, TypeDescriptionContainer, TypeName},
     api::ManagedTypeApi,
@@ -222,11 +224,7 @@ where
     M: ManagedTypeApi,
     T: ManagedVecItem,
 {
-    #[cfg(feature = "alloc")]
-    type Unmanaged = multiversx_sc_codec::multi_types::MultiValueVec<T::Unmanaged>;
-
-    #[cfg(not(feature = "alloc"))]
-    type Unmanaged = Self;
+    type Unmanaged = MultiValueVec<T::Unmanaged>;
 
     fn type_name() -> TypeName {
         crate::abi::type_name_variadic::<T>()

framework/base/src/types/managed/wrapped/managed_address.rs

@@ -235,12 +235,8 @@ impl<M> TypeAbi for ManagedAddress<M>
 where
     M: ManagedTypeApi,
 {
-    #[cfg(feature = "alloc")]
     type Unmanaged = crate::types::heap::Address;
 
-    #[cfg(not(feature = "alloc"))]
-    type Unmanaged = Self;
-
     /// `"Address"` instead of `"array32<u8>"`.
     fn type_name() -> TypeName {
         Address::type_name()
@@ -274,14 +270,7 @@ impl<M: ManagedTypeApi> core::fmt::Debug for ManagedAddress<M> {
 
 impl<M> TypeAbiFrom<[u8; 32]> for ManagedAddress<M> where M: ManagedTypeApi {}
 
-#[cfg(feature = "alloc")]
 impl<M> TypeAbiFrom<Address> for ManagedAddress<M> where M: ManagedTypeApi {}
-
-#[cfg(feature = "alloc")]
 impl<M> TypeAbiFrom<&Address> for ManagedAddress<M> where M: ManagedTypeApi {}
-
-#[cfg(feature = "alloc")]
 impl<M> TypeAbiFrom<ManagedAddress<M>> for Address where M: ManagedTypeApi {}
-
-#[cfg(feature = "alloc")]
 impl<M> TypeAbiFrom<&ManagedAddress<M>> for Address where M: ManagedTypeApi {}