Use Self more.

Author: briansmith

src/aead.rs

@@ -74,7 +74,7 @@ impl<A: AsRef<[u8]>> Aad<A> {
     /// Construct the `Aad` from the given bytes.
     #[inline]
     pub fn from(aad: A) -> Self {
-        Aad(aad)
+        Self(aad)
     }
 }
 

src/aead/chacha20_poly1305_openssh.rs

@@ -45,8 +45,8 @@ pub struct SealingKey {
 
 impl SealingKey {
     /// Constructs a new `SealingKey`.
-    pub fn new(key_material: &[u8; KEY_LEN]) -> SealingKey {
-        SealingKey {
+    pub fn new(key_material: &[u8; KEY_LEN]) -> Self {
+        Self {
             key: Key::new(key_material, cpu::features()),
         }
     }
@@ -92,8 +92,8 @@ pub struct OpeningKey {
 
 impl OpeningKey {
     /// Constructs a new `OpeningKey`.
-    pub fn new(key_material: &[u8; KEY_LEN]) -> OpeningKey {
-        OpeningKey {
+    pub fn new(key_material: &[u8; KEY_LEN]) -> Self {
+        Self {
             key: Key::new(key_material, cpu::features()),
         }
     }
@@ -153,10 +153,10 @@ struct Key {
 }
 
 impl Key {
-    fn new(key_material: &[u8; KEY_LEN], cpu_features: cpu::Features) -> Key {
+    fn new(key_material: &[u8; KEY_LEN], cpu_features: cpu::Features) -> Self {
         // The first half becomes K_2 and the second half becomes K_1.
         let &[k_2, k_1]: &[[u8; chacha::KEY_LEN]; 2] = key_material.chunks_fixed();
-        Key {
+        Self {
             k_1: k_1.into(),
             k_2: k_2.into(),
             cpu_features,

src/aead/gcm.rs

@@ -86,7 +86,7 @@ pub struct Context {
 
 impl Context {
     pub(crate) fn new(key: &Key, aad: Aad<&[u8]>, cpu_features: cpu::Features) -> Self {
-        let mut ctx = Context {
+        let mut ctx = Self {
             inner: ContextInner {
                 Xi: Xi(Block::zero()),
                 _unused: Block::zero(),

src/agreement.rs

@@ -81,7 +81,7 @@ derive_debug_via_field!(Algorithm, curve);
 
 impl Eq for Algorithm {}
 impl PartialEq for Algorithm {
-    fn eq(&self, other: &Algorithm) -> bool {
+    fn eq(&self, other: &Self) -> bool {
         self.curve.id == other.curve.id
     }
 }

src/arithmetic/bigint.rs

@@ -432,7 +432,7 @@ impl<M> Elem<M, Unencoded> {
         input: untrusted::Input,
         m: &Modulus<M>,
     ) -> Result<Self, error::Unspecified> {
-        Ok(Elem {
+        Ok(Self {
             limbs: BoxedLimbs::from_be_bytes_padded_less_than(input, m)?,
             encoding: PhantomData,
         })

src/bits.rs

@@ -57,8 +57,8 @@ impl BitLength {
 
     #[cfg(feature = "alloc")]
     #[inline]
-    pub fn try_sub_1(self) -> Result<BitLength, error::Unspecified> {
+    pub fn try_sub_1(self) -> Result<Self, error::Unspecified> {
         let sum = self.0.checked_sub(1).ok_or(error::Unspecified)?;
-        Ok(BitLength(sum))
+        Ok(Self(sum))
     }
 }

src/digest/sha2.rs

@@ -178,17 +178,17 @@ const MAX_ROUNDS: usize = 80;
 pub(super) const CHAINING_WORDS: usize = 8;
 
 impl Word for Wrapping<u32> {
-    const ZERO: Self = Wrapping(0);
+    const ZERO: Self = Self(0);
     type InputBytes = [u8; 4];
 
     #[inline(always)]
     fn from_be_bytes(input: Self::InputBytes) -> Self {
-        Wrapping(u32::from_be_bytes(input))
+        Self(u32::from_be_bytes(input))
     }
 
     #[inline(always)]
     fn rotr(self, count: u32) -> Self {
-        Wrapping(self.0.rotate_right(count))
+        Self(self.0.rotate_right(count))
     }
 }
 
@@ -270,17 +270,17 @@ impl Sha2 for Wrapping<u32> {
 }
 
 impl Word for Wrapping<u64> {
-    const ZERO: Self = Wrapping(0);
+    const ZERO: Self = Self(0);
     type InputBytes = [u8; 8];
 
     #[inline(always)]
     fn from_be_bytes(input: Self::InputBytes) -> Self {
-        Wrapping(u64::from_be_bytes(input))
+        Self(u64::from_be_bytes(input))
     }
 
     #[inline(always)]
     fn rotr(self, count: u32) -> Self {
-        Wrapping(self.0.rotate_right(count))
+        Self(self.0.rotate_right(count))
     }
 }
 

src/ec/keys.rs

@@ -45,7 +45,7 @@ impl Seed {
         curve: &'static Curve,
         bytes: untrusted::Input,
         cpu_features: cpu::Features,
-    ) -> Result<Seed, error::Unspecified> {
+    ) -> Result<Self, error::Unspecified> {
         let bytes = bytes.as_slice_less_safe();
         if curve.elem_scalar_seed_len != bytes.len() {
             return Err(error::Unspecified);

src/ec/suite_b/ecdsa/signing.rs

@@ -358,7 +358,7 @@ impl NonceRandomKey {
         let mut ctx = digest::Context::new(alg.digest_alg);
         ctx.update(rand);
         ctx.update(seed.bytes_less_safe());
-        Ok(NonceRandomKey(ctx.finish()))
+        Ok(Self(ctx.finish()))
     }
 }
 

src/ec/suite_b/ops.rs

@@ -43,8 +43,8 @@ pub struct Point {
 }
 
 impl Point {
-    pub fn new_at_infinity() -> Point {
-        Point {
+    pub fn new_at_infinity() -> Self {
+        Self {
             xyz: [0; 3 * MAX_LIMBS],
         }
     }