Browse Source

Some Clippy fixes and allows

Benjamin Sago 5 năm trước cách đây
mục cha
commit
3852de81db
8 tập tin đã thay đổi với 22 bổ sung18 xóa
  1. 2 0
      build.rs
  2. 1 1
      dns-transport/src/udp.rs
  3. 3 3
      dns/src/record/mx.rs
  4. 3 3
      dns/src/record/ns.rs
  5. 3 3
      dns/src/record/soa.rs
  6. 3 3
      dns/src/record/srv.rs
  7. 2 0
      src/main.rs
  8. 5 5
      src/table.rs

+ 2 - 0
build.rs

@@ -24,6 +24,8 @@ use regex::Regex;
 
 /// The build script entry point.
 fn main() -> io::Result<()> {
+    #![allow(clippy::write_with_newline)]
+
     let usage   = include_str!("src/usage.txt");
     let tagline = "dog \\1;32m●\\0m command-line DNS client";
     let url     = "https://dns.lookup.dog/";

+ 1 - 1
dns-transport/src/udp.rs

@@ -67,7 +67,7 @@ impl Transport for UdpTransport {
         debug!("Sent {} bytes", len);
 
         info!("Waiting to receive...");
-        let mut buf = vec![0u8; 1024];
+        let mut buf = vec![0; 1024];
         let len = socket.recv(&mut buf).await?;
 
         info!("Received {} bytes of data", len);

+ 3 - 3
dns/src/record/mx.rs

@@ -29,11 +29,11 @@ impl Wire for MX {
         let preference = c.read_u16::<BigEndian>()?;
         let exchange = c.read_labels()?;
 
-        if 2 + exchange.len() + 1 != len as usize {
-            warn!("Expected length {} but read {} bytes", len, 2 + exchange.len() + 1);
+        if 2 + exchange.len() + 1 == len as usize {
+            debug!("Length {} is correct", len);
         }
         else {
-            debug!("Length {} is correct", len);
+            warn!("Expected length {} but read {} bytes", len, 2 + exchange.len() + 1);
         }
 
         Ok(MX { preference, exchange })

+ 3 - 3
dns/src/record/ns.rs

@@ -24,11 +24,11 @@ impl Wire for NS {
     fn read(len: u16, c: &mut Cursor<&[u8]>) -> Result<Self, WireError> {
         let nameserver = c.read_labels()?;
 
-        if nameserver.len() + 1 != len as usize {
-            warn!("Expected length {} but read {} bytes", len, nameserver.len() + 1);
+        if nameserver.len() + 1 == len as usize {
+            debug!("Length {} is correct", nameserver.len() + 1);
         }
         else {
-            debug!("Length {} is correct", nameserver.len() + 1);
+            warn!("Expected length {} but read {} bytes", len, nameserver.len() + 1);
         }
 
         Ok(NS { nameserver })

+ 3 - 3
dns/src/record/soa.rs

@@ -56,11 +56,11 @@ impl Wire for SOA {
         let minimum_ttl      = c.read_u32::<BigEndian>()?;
 
         let got_length = mname.len() + rname.len() + 4 * 5 + 2;
-        if got_length != len as usize {
-            warn!("Expected length {} but got {}", len, got_length);
+        if got_length == len as usize {
+            debug!("Length {} is correct", len);
         }
         else {
-            debug!("Length {} is correct", len);
+            warn!("Expected length {} but got {}", len, got_length);
         }
 
         Ok(SOA {

+ 3 - 3
dns/src/record/srv.rs

@@ -39,11 +39,11 @@ impl Wire for SRV {
         let target   = c.read_labels()?;
 
         let got_length = 3 * 2 + target.len() + 1;
-        if got_length != len as usize {
-            warn!("Expected length {} but got {}", len, got_length);
+        if got_length == len as usize {
+            debug!("Length {} is correct", len);
         }
         else {
-            debug!("Length {} is correct", len);
+            warn!("Expected length {} but got {}", len, got_length);
         }
 
         Ok(SRV { priority, weight, port, target })

+ 2 - 0
src/main.rs

@@ -14,6 +14,8 @@
 #![warn(clippy::all, clippy::pedantic)]
 #![allow(clippy::enum_glob_use)]
 #![allow(clippy::module_name_repetitions)]
+#![allow(clippy::unit_arg)]
+#![allow(clippy::useless_let_if_seq)]
 #![allow(clippy::wildcard_imports)]
 
 #![deny(unsafe_code)]

+ 5 - 5
src/table.rs

@@ -72,7 +72,10 @@ impl Table {
 
     /// Prints the formatted table to stdout.
     pub fn print(self, duration: Option<Duration>) {
-        if ! self.rows.is_empty() {
+        if self.rows.is_empty() {
+            println!("No results");
+        }
+        else {
             let qtype_len = self.max_qtype_len();
             let qname_len = self.max_qname_len();
             let ttl_len   = self.max_ttl_len();
@@ -104,9 +107,6 @@ impl Table {
                 println!(" {} {}", self.format_section(r.section), r.summary);
             }
         }
-        else {
-            println!("No results");
-        }
 
         if let Some(dur) = duration {
             println!("Ran in {}ms", dur.as_millis());
@@ -139,7 +139,7 @@ impl Table {
     }
 
     fn max_ttl_len(&self) -> usize {
-        self.rows.iter().map(|r| r.ttl.as_ref().map_or(0, |e| e.len())).max().unwrap()
+        self.rows.iter().map(|r| r.ttl.as_ref().map_or(0, String::len)).max().unwrap()
     }
 
     fn format_section(&self, section: Section) -> ANSIString<'static> {