Bump bitflags, fix clippy lints

Author: brndnmtthws

Cargo.toml

@@ -14,7 +14,7 @@ version = "0.5.1"
 
 [dependencies]
 base64 = { version = "0.21", optional = true }
-bitflags = "1.0"
+bitflags = "2.3"
 chacha20 = { version = "0.9", features = ["zeroize"] }
 curve25519-dalek = "4.0"
 generic-array = "0.14"

src/blake2b/blake2b_soft.rs

@@ -79,7 +79,7 @@ const IV: [u64; 8] = [
     0x5be0cd19137e2179,
 ];
 
-fn compress(sh: &mut [u64; 8], st: &mut [u64; 2], sf: &mut [u64; 2], block: &[u8]) {
+fn compress(sh: &mut [u64; 8], st: &[u64; 2], sf: &[u64; 2], block: &[u8]) {
     let mut tm = [0u64; 16];
     let mut tv = [0u64; 16];
 
@@ -275,33 +275,23 @@ impl State {
 
         if self.buf.len() > BLOCKBYTES {
             increment_counter(&mut self.t, BLOCKBYTES);
-            compress(
-                &mut self.h,
-                &mut self.t,
-                &mut self.f,
-                &self.buf[..BLOCKBYTES],
-            );
+            compress(&mut self.h, &self.t, &self.f, &self.buf[..BLOCKBYTES]);
 
             increment_counter(&mut self.t, self.buf.len() - BLOCKBYTES);
             self.set_lastblock();
 
             // fill last block with zero padding
             self.buf.resize(2 * BLOCKBYTES, 0);
 
-            compress(
-                &mut self.h,
-                &mut self.t,
-                &mut self.f,
-                &self.buf[BLOCKBYTES..],
-            );
+            compress(&mut self.h, &self.t, &self.f, &self.buf[BLOCKBYTES..]);
         } else {
             increment_counter(&mut self.t, self.buf.len());
             self.set_lastblock();
 
             // fill last block with zero padding
             self.buf.resize(BLOCKBYTES, 0);
 
-            compress(&mut self.h, &mut self.t, &mut self.f, &self.buf);
+            compress(&mut self.h, &self.t, &self.f, &self.buf);
         }
         self.buf.zeroize();
 

src/classic/crypto_core.rs

@@ -46,7 +46,7 @@ pub fn crypto_scalarmult(
 }
 
 #[inline]
-fn chacha20_round(x: &mut u32, y: &mut u32, z: &mut u32, rot: u32) {
+fn chacha20_round(x: &mut u32, y: &u32, z: &mut u32, rot: u32) {
     *x = x.wrapping_add(*y);
     *z = (*z ^ *x).rotate_left(rot);
 }

src/dryocstream.rs

@@ -176,6 +176,7 @@ pub mod protected {
 
 bitflags! {
     /// Message tag definitions
+    #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
     pub struct Tag: u8 {
         /// Describes a normal message in a stream.
         const MESSAGE = CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_MESSAGE;
@@ -185,7 +186,7 @@ bitflags! {
         /// Derives a new key for the stream.
         const REKEY = CRYPTO_SECRETSTREAM_XCHACHA20POLY1305_TAG_REKEY;
         /// Indicates the end of the stream.
-        const FINAL = Self::PUSH.bits | Self::REKEY.bits;
+        const FINAL = Self::PUSH.bits() | Self::REKEY.bits();
     }
 }
 

src/types.rs

@@ -3,7 +3,7 @@ use std::convert::TryFrom;
 use lazy_static::__Deref;
 use zeroize::{Zeroize, ZeroizeOnDrop};
 
-#[cfg(any(feature = "serde"))]
+#[cfg(feature = "serde")]
 pub use crate::bytes_serde::*;
 use crate::rng::copy_randombytes;
 
@@ -311,6 +311,7 @@ impl<const LENGTH: usize> Bytes for [u8; LENGTH] {
     }
 }
 
+#[allow(suspicious_double_ref_op)]
 impl<const LENGTH: usize> Bytes for &[u8; LENGTH] {
     #[inline]
     fn as_slice(&self) -> &[u8] {