Include alloc feature in std, run cargo fmt

Author: samuelburnham

Cargo.toml

@@ -16,7 +16,7 @@ resolver = "2"
 
 [features]
 default = ["std", "derive", "multihash-impl", "secure-hashes"]
-std = ["unsigned-varint/std", "multihash-derive/std"]
+std = ["unsigned-varint/std", "multihash-derive/std", "alloc"]
 alloc = []
 multihash-impl = ["derive"]
 derive = ["multihash-derive"]

src/lib.rs

@@ -52,7 +52,7 @@
 #![deny(missing_docs)]
 #![cfg_attr(not(feature = "std"), no_std)]
 
-#[cfg(all(not(feature = "std"), feature = "alloc"))]
+#[cfg(feature = "alloc")]
 #[macro_use]
 extern crate alloc;
 

src/multihash.rs

@@ -1,6 +1,6 @@
 use crate::hasher::{Digest, Size};
 use crate::Error;
-#[cfg(all(not(feature = "std"), feature = "alloc"))]
+#[cfg(feature = "alloc")]
 use alloc::vec::Vec;
 use core::convert::TryFrom;
 
@@ -160,7 +160,7 @@ impl<S: Size> Multihash<S> {
         write_multihash(w, self.code(), self.size(), self.digest())
     }
 
-  #[cfg(any(feature = "std", feature = "alloc"))]
+    #[cfg(feature = "alloc")]
     /// Returns the bytes of a multihash.
     pub fn to_bytes(&self) -> Vec<u8> {
         let mut bytes = Vec::with_capacity(self.size().into());
@@ -179,7 +179,7 @@ impl<S: Size> core::hash::Hash for Multihash<S> {
     }
 }
 
-#[cfg(any(feature = "std", feature = "alloc"))]
+#[cfg(feature = "alloc")]
 impl<S: Size> From<Multihash<S>> for Vec<u8> {
     fn from(multihash: Multihash<S>) -> Self {
         multihash.to_bytes()
@@ -286,8 +286,8 @@ where
     R: io::Read,
     S: Size,
 {
-  let code = read_u64(&mut r)?;
-  let size = read_u64(&mut r)?;
+    let code = read_u64(&mut r)?;
+    let size = read_u64(&mut r)?;
 
     if size > S::to_u64() || size > u8::MAX as u64 {
         return Err(Error::InvalidSize(size));