Fix some Errors

RustCrypto · Aug 11, 2023 · f1c660c · f1c660c
1 parent 022a9ca
commit f1c660c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 15 deletions.
diff --git a/argon2/src/lib.rs b/argon2/src/lib.rs
@@ -173,12 +173,6 @@ pub struct Argon2<'key> {
     cpu_feat_avx2: avx2_cpuid::InitToken,
 }
 
-impl Default for Argon2<'_> {
-    fn default() -> Self {
-        Self::DEFAULT
-    }
-}
-
 impl fmt::Debug for Argon2<'_> {
     fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
         fmt.debug_struct("Argon2")
@@ -190,11 +184,8 @@ impl fmt::Debug for Argon2<'_> {
 }
 
 impl<'key> Argon2<'key> {
-    /// Default parameters (recommended).
-    pub const DEFAULT: Argon2<'static> =
-        Argon2::new(Algorithm::DEFAULT, Version::DEFAULT, Params::DEFAULT);
     /// Create a new Argon2 context.
-    pub const fn new(algorithm: Algorithm, version: Version, params: Params) -> Self {
+    pub fn new(algorithm: Algorithm, version: Version, params: Params) -> Self {
         Self {
             algorithm,
             version,

diff --git a/argon2/src/params.rs b/argon2/src/params.rs
@@ -510,14 +510,11 @@ impl ParamsBuilder {
     }
 
     /// Create a new [`Argon2`] context using the provided algorithm/version.
-    pub const fn context(&self, algorithm: Algorithm, version: Version) -> Result<Argon2<'_>> {
+    pub fn context(&self, algorithm: Algorithm, version: Version) -> Result<Argon2<'_>> {
         Ok(Argon2::new(
             algorithm,
             version,
-            match self.build() {
-                Ok(params) => params,
-                Err(e) => return Err(e),
-            },
+            self.build()?
         ))
     }
     /// Default parameters (recommended).