Merge pull request #14 from internet2-org/lints

Fixing all lints

Author: dr-orlovsky

.github/workflows/lint.yml

@@ -14,14 +14,44 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Install latest nightly
+      - name: Install rustc nightly
         uses: actions-rs/toolchain@v1
         with:
           toolchain: nightly
           override: true
           components: rustfmt
       - uses: actions-rs/cargo@v1
-        name: Lints
+        name: Formatting
         with:
           command: fmt
           args: --all -- --check
+  clippy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install rustc stable
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+          override: true
+          components: clippy
+      - uses: actions-rs/cargo@v1
+        name: Clippy
+        with:
+          command: clippy
+          args: --workspace --all-features
+  doc:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Install rustc nightly
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: nightly
+          override: true
+          components: rust-docs
+      - uses: actions-rs/cargo@v1
+        name: Clippy
+        with:
+          command: doc
+          args: --workspace --all-features

.rustfmt.toml

@@ -1,3 +1,14 @@
 max_width = 80
-wrap_comments = true
 format_code_in_doc_comments = true
+fn_single_line = true
+format_macro_matchers = true
+format_strings = true
+merge_derives = false
+imports_granularity = "Module"
+overflow_delimited_expr = true
+group_imports = "StdExternalCrate"
+use_field_init_shorthand = true
+use_try_shorthand = true
+wrap_comments = true
+comment_width = 80
+unstable_features = true

Cargo.toml

@@ -17,6 +17,11 @@ name = "internet2"
 path = "src/lib.rs"
 crate-type = ["rlib", "staticlib"]
 
+[[test]]
+name = "noise_xk"
+path = "tests/noise_xk.rs"
+required-features = ["keygen"]
+
 # Dependencies
 # ============
 [dependencies]

addr/README.md

@@ -1,3 +1,3 @@
 # Internet2 addresses crate
 
-Internet2 addresses with support for Tor v2, v3.
+Internet2 addresses with support for Tor v3.

addr/src/encoding.rs

@@ -1,6 +1,6 @@
-// Internet2 addresses with support for Tor v2, v3
+// Internet2 addresses with support for Tor v3
 //
-// Written in 2019-2020 by
+// Written in 2019-2021 by
 //     Dr. Maxim Orlovsky <[email protected]>
 //     Martin Habovstiak <[email protected]>
 //
@@ -14,12 +14,12 @@
 // If not, see <https://opensource.org/licenses/MIT>.
 
 use std::net::{Ipv4Addr, Ipv6Addr};
-#[cfg(feature = "tor")]
-use torut::onion::{TorPublicKeyV3, TORV3_PUBLIC_KEY_LENGTH};
 
 use strict_encoding::net::{
     AddrFormat, DecodeError, RawAddr, Transport, Uniform, UniformAddr, ADDR_LEN,
 };
+#[cfg(feature = "tor")]
+use torut::onion::{TorPublicKeyV3, TORV3_PUBLIC_KEY_LENGTH};
 
 use crate::{InetAddr, InetSocketAddr, InetSocketAddrExt};
 
@@ -61,14 +61,10 @@ impl Uniform for InetAddr {
     }
 
     #[inline]
-    fn port(&self) -> Option<u16> {
-        None
-    }
+    fn port(&self) -> Option<u16> { None }
 
     #[inline]
-    fn transport(&self) -> Option<Transport> {
-        None
-    }
+    fn transport(&self) -> Option<Transport> { None }
 
     #[inline]
     fn from_uniform_addr(addr: UniformAddr) -> Result<Self, DecodeError>
@@ -95,31 +91,23 @@ impl Uniform for InetAddr {
             }
             #[cfg(feature = "tor")]
             AddrFormat::OnionV3 => InetAddr::Tor(tor_from_raw_addr(addr.addr)?),
-            _ => Err(DecodeError::UnsupportedAddrFormat)?,
+            _ => return Err(DecodeError::UnsupportedAddrFormat),
         })
     }
 }
 
 impl Uniform for InetSocketAddr {
     #[inline]
-    fn addr_format(&self) -> AddrFormat {
-        self.address.addr_format()
-    }
+    fn addr_format(&self) -> AddrFormat { self.address.addr_format() }
 
     #[inline]
-    fn addr(&self) -> RawAddr {
-        self.address.addr()
-    }
+    fn addr(&self) -> RawAddr { self.address.addr() }
 
     #[inline]
-    fn port(&self) -> Option<u16> {
-        Some(self.port)
-    }
+    fn port(&self) -> Option<u16> { Some(self.port) }
 
     #[inline]
-    fn transport(&self) -> Option<Transport> {
-        None
-    }
+    fn transport(&self) -> Option<Transport> { None }
 
     #[inline]
     fn from_uniform_addr(addr: UniformAddr) -> Result<Self, DecodeError>
@@ -148,19 +136,13 @@ impl Uniform for InetSocketAddr {
 
 impl Uniform for InetSocketAddrExt {
     #[inline]
-    fn addr_format(&self) -> AddrFormat {
-        self.1.addr_format()
-    }
+    fn addr_format(&self) -> AddrFormat { self.1.addr_format() }
 
     #[inline]
-    fn addr(&self) -> RawAddr {
-        self.1.addr()
-    }
+    fn addr(&self) -> RawAddr { self.1.addr() }
 
     #[inline]
-    fn port(&self) -> Option<u16> {
-        Some(self.1.port)
-    }
+    fn port(&self) -> Option<u16> { Some(self.1.port) }
 
     #[inline]
     fn transport(&self) -> Option<Transport> {