Merge remote-tracking branch 'nickray/towards-no-std' into develop

This commit is contained in:
Isis Lovecruft 2019-03-12 21:11:09 +00:00
commit a6e0019ae4
No known key found for this signature in database
GPG key ID: AB41313533E8E812
2 changed files with 6 additions and 1 deletions

View file

@ -22,6 +22,7 @@ default-features = false
[dependencies.rand] [dependencies.rand]
version = "0.6" version = "0.6"
features = ["i128_support"] features = ["i128_support"]
default-features = false
[dependencies.serde] [dependencies.serde]
version = "^1.0" version = "^1.0"

View file

@ -9,6 +9,7 @@
//! ed25519 keypairs and batch verification. //! ed25519 keypairs and batch verification.
#[allow(unused_imports)]
use core::default::Default; use core::default::Default;
use rand::CryptoRng; use rand::CryptoRng;
@ -28,8 +29,11 @@ pub use sha2::Sha512;
use curve25519_dalek::digest::generic_array::typenum::U64; use curve25519_dalek::digest::generic_array::typenum::U64;
pub use curve25519_dalek::digest::Digest; pub use curve25519_dalek::digest::Digest;
#[cfg(any(feature = "alloc", feature = "std"))]
use curve25519_dalek::constants; use curve25519_dalek::constants;
#[cfg(any(feature = "alloc", feature = "std"))]
use curve25519_dalek::edwards::EdwardsPoint; use curve25519_dalek::edwards::EdwardsPoint;
#[cfg(any(feature = "alloc", feature = "std"))]
use curve25519_dalek::scalar::Scalar; use curve25519_dalek::scalar::Scalar;
pub use crate::constants::*; pub use crate::constants::*;