Remove the destructuring of Self.

Signed-off-by: Bob McWhirter <bmcwhirt@redhat.com>
sigstore · Sep 30, 2022 · aee1b6d · aee1b6d
1 parent a9b9017
commit aee1b6d
Showing 1 changed file with 8 additions and 22 deletions.
diff --git a/src/oauth/openidflow.rs b/src/oauth/openidflow.rs
@@ -271,45 +271,31 @@ impl RedirectListener {
     pub fn redirect_listener(self) -> Result<(CoreIdTokenClaims, CoreIdToken)> {
         let code = self.redirect_listener_internal()?;
 
-        let Self {
-            pkce_verifier,
-            nonce,
-            client,
-            ..
-        } = self;
-
-        let token_response = client
+        let token_response = self.client
             .exchange_code(code)
-            .set_pkce_verifier(pkce_verifier)
+            .set_pkce_verifier(self.pkce_verifier)
             .request(http_client)
             .map_err(|_| SigstoreError::ClaimsAccessPointError)?;
 
-        Self::extract_token_and_claims(&token_response, client.id_token_verifier(), nonce)
+        Self::extract_token_and_claims(&token_response, &self.client.id_token_verifier(), self.nonce)
     }
 
     pub async fn redirect_listener_async(self) -> Result<(CoreIdTokenClaims, CoreIdToken)> {
         let code = self.redirect_listener_internal()?;
 
-        let Self {
-            pkce_verifier,
-            nonce,
-            client,
-            ..
-        } = self;
-
-        let token_response = client
+        let token_response = self.client
             .exchange_code(code)
-            .set_pkce_verifier(pkce_verifier)
+            .set_pkce_verifier(self.pkce_verifier)
             .request_async(async_http_client)
             .await
             .map_err(|_| SigstoreError::ClaimsAccessPointError)?;
 
-        Self::extract_token_and_claims(&token_response, client.id_token_verifier(), nonce)
+        Self::extract_token_and_claims(&token_response, &self.client.id_token_verifier(), self.nonce)
     }
 
     fn extract_token_and_claims(
         token_response: &CoreTokenResponse,
-        id_token_verifier: CoreIdTokenVerifier,
+        id_token_verifier: &CoreIdTokenVerifier,
         nonce: Nonce,
     ) -> Result<(CoreIdTokenClaims, CoreIdToken)> {
         let id_token = token_response
@@ -321,7 +307,7 @@ impl RedirectListener {
             .extra_fields()
             .id_token()
             .expect("Server did not return an ID token")
-            .claims(&id_token_verifier, &nonce)
+            .claims(id_token_verifier, &nonce)
             .map_err(|_| SigstoreError::ClaimsVerificationError)?;
         Ok((id_token_claims.clone(), id_token.clone()))
     }