Merge pull request #129 from AluVM/develop

Fix alloc/std ambiguity

Cargo.toml

@@ -21,7 +21,7 @@ name = "aluvm-stl"
 required-features = ["stl"]
 
 [dependencies]
-amplify = { version = "4.7.0", default-features = false, features = ["apfloat", "derive", "hex"] }
+amplify = { version = "4.8.0", default-features = false, features = ["apfloat", "derive", "hex"] }
 ascii-armor = { version = "0.7.2", optional = true }
 baid64 = "0.2.2"
 paste = "1"
@@ -39,7 +39,7 @@ serde_crate = { package = "serde", version = "1", optional = true }
 default = ["std"]
 all = ["stl", "std", "log", "secp256k1", "curve25519", "serde", "ascii-armor"]
 stl = ["strict_types/armor", "std"]
-std = ["amplify/std"]
+std = ["amplify/std", "alloc"]
 log = ["std"]
 alloc = ["amplify/alloc"]
 curve25519 = ["curve25519-dalek"]

src/data/byte_str.rs

@@ -23,9 +23,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::boxed::Box;
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::vec::Vec;
 use core::borrow::{Borrow, BorrowMut};
 use core::convert::TryFrom;

src/data/number.rs

@@ -26,9 +26,9 @@
 //! Module defining number layout (integer, signed/unsigned, float etc) and universal in-memory
 //! number representation.
 
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::format;
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::string::{String, ToString};
 use core::fmt::{
     self, Debug, Display, Formatter, LowerExp, LowerHex, Octal, UpperExp, UpperHex, Write,

src/isa/bytecode.rs

@@ -25,7 +25,7 @@
 
 //! Instruction serialization and deserialization from bytecode.
 
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::boxed::Box;
 use core::ops::RangeInclusive;
 

src/isa/exec.rs

@@ -23,10 +23,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::boxed::Box;
 use alloc::collections::BTreeSet;
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::string::{String, ToString};
 use core::cmp::Ordering;
 use core::ops::{BitAnd, BitOr, BitXor, Neg, Rem, Shl, Shr};

src/isa/flags.rs

@@ -25,9 +25,9 @@
 
 //! Flags used by operation codes
 
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::borrow::ToOwned;
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::string::String;
 use core::fmt::{self, Display, Formatter, Write};
 use core::str::FromStr;

src/isa/instr.rs

@@ -23,7 +23,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::boxed::Box;
 
 use super::{

src/lib.rs

@@ -142,10 +142,11 @@
 // TODO(#7) Complete assembly compiler for string operations
 // TODO(#8) Implement operations on Edwards curves
 
+#[cfg(not(any(feature = "alloc", feature = "std")))]
+compile_error!("either `alloc` or `std` feature must be used");
+
 #[macro_use]
 extern crate alloc;
-#[cfg(all(feature = "alloc", not(feature = "std")))]
-extern crate alloc as std;
 
 #[macro_use]
 extern crate amplify;

src/library/lib.rs

@@ -23,9 +23,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::string::{String, ToString};
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::vec::Vec;
 use core::cmp::Ordering;
 use core::fmt::{self, Display, Formatter};

src/library/segs.rs

@@ -25,12 +25,12 @@
 
 //! Data structures representing static library segments
 
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::borrow::ToOwned;
 use alloc::collections::{btree_set, BTreeSet};
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::string::{String, ToString};
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::vec::Vec;
 use core::fmt::{self, Debug, Display, Formatter};
 use core::str::FromStr;

src/reg/core_regs.rs

@@ -23,11 +23,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::boxed::Box;
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::string::ToString;
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::vec::Vec;
 use core::fmt::{self, Debug, Formatter};
 

src/vm.rs

@@ -25,7 +25,7 @@
 
 //! Alu virtual machine
 
-#[cfg(all(feature = "alloc", not(feature = "std")))]
+#[cfg(feature = "alloc")]
 use alloc::boxed::Box;
 use core::marker::PhantomData;