Browse Source

Cleanup build warnings.

Matthew Carr 3 years ago
parent
commit
ef728c3050
2 changed files with 28 additions and 11 deletions
  1. 10 0
      crates/node/src/main.rs
  2. 18 11
      crates/node/src/serde_blocktree/ser.rs

+ 10 - 0
crates/node/src/main.rs

@@ -2,10 +2,12 @@ mod serde_blocktree;
 
 use std::collections::{hash_map, HashMap};
 
+#[allow(dead_code)]
 enum VersionedBlock {
     V0(Block)
 }
 
+#[allow(dead_code)]
 struct Block {
     path: String,
     read_caps: HashMap<Hash, ReadCap>,
@@ -14,11 +16,13 @@ struct Block {
     signature: Signature
 }
 
+#[allow(dead_code)]
 struct ReadCap {
     issued_to: Hash,
     key: EnvelopedKey,
 }
 
+#[allow(dead_code)]
 struct WriteCap {
     issued_to: Hash,
     path: String,
@@ -26,22 +30,26 @@ struct WriteCap {
     signature: Signature,
 }
 
+#[allow(dead_code)]
 struct Certificate {
     issued_to: Hash,
     issued_by: Hash,
     signature: Signature,
 }
 
+#[allow(dead_code)]
 enum Hash {
     None,
     Sha2_256([u8; 32]),
     Sha2_512([u8; 64]),
 }
 
+#[allow(dead_code)]
 enum Signature {
     Ed25519([u8; 64]),
 }
 
+#[allow(dead_code)]
 enum EnvelopedKey {
     Xsalsa20Poly1305([u8; 32]),
 }
@@ -58,11 +66,13 @@ impl IDirectory for Directory {
     }
 }
 
+#[allow(dead_code)]
 struct FragmentRecord {
     stored_by: Hash,
     serial: u32,
 }
 
+#[allow(dead_code)]
 struct Fragment {
     path: String,
     serial: u32,

+ 18 - 11
crates/node/src/serde_blocktree/ser.rs

@@ -22,6 +22,7 @@ pub struct Serializer<T: Write> {
     output: T,
 }
 
+#[allow(dead_code)]
 pub fn to_vec<T: Serialize + ?Sized>(value: &T) -> Result<Vec<u8>> {
     let mut serializer = Serializer { output: Vec::new()};
     value.serialize(&mut serializer)?;
@@ -369,20 +370,24 @@ impl<'a, T: Write> SerializeStructVariant for &'a mut Serializer<T> {
     }
 }
 
+#[allow(dead_code)]
 mod test {
+    // This is actually used in every method below.
+    #[allow(unused_imports)]
     use super::Result;
-    use super::super::super::{
-        VersionedBlock,
-        Block,
-        ReadCap,
-        WriteCap,
-        Certificate,
-        Hash,
-        Signature,
-        EnvelopedKey
-    };
+    // This is also used in several methods below.
+    #[allow(unused_imports)]
     use serde::Serialize;
-    use std::collections::HashMap;
+    //use super::super::super::{
+    //    VersionedBlock,
+    //    Block,
+    //    ReadCap,
+    //    WriteCap,
+    //    Certificate,
+    //    Hash,
+    //    Signature,
+    //    EnvelopedKey
+    //};
 
     #[test]
     fn serialize_bool() -> Result<()> {
@@ -686,6 +691,8 @@ mod test {
 
     #[test]
     fn serialize_map() -> Result<()> {
+        use std::collections::HashMap;
+
         #[derive(PartialEq, Eq, Hash, Serialize)]
         enum Color { Red, Blue }
         let mut map: HashMap<Color, u16> = HashMap::new();