From 761ca543c6d4e45b3277ef43877f7efd067a8104 Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@pep.foundation>
Date: Wed, 26 Feb 2020 21:49:28 +0100
Subject: openpgp: Use a slightly less ambiguous name.

---
 openpgp/src/cert/amalgamation.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/openpgp/src/cert/amalgamation.rs b/openpgp/src/cert/amalgamation.rs
index 0a07018a..9d5515d3 100644
--- a/openpgp/src/cert/amalgamation.rs
+++ b/openpgp/src/cert/amalgamation.rs
@@ -252,7 +252,7 @@ impl<'a, C> Amalgamation<'a, C> for ComponentAmalgamation<'a, C> {
         let time = time.into().unwrap_or_else(SystemTime::now);
         if let Some(binding_signature) = self.binding_signature(policy, time) {
             Ok(ValidComponentAmalgamation {
-                a: self,
+                ca: self,
                 policy: policy,
                 time: time,
                 binding_signature: binding_signature,
@@ -304,7 +304,7 @@ impl<'a> ComponentAmalgamation<'a, crate::packet::UserAttribute> {
 /// A certificate's component and its associated data.
 #[derive(Debug)]
 pub struct ValidComponentAmalgamation<'a, C> {
-    a: ComponentAmalgamation<'a, C>,
+    ca: ComponentAmalgamation<'a, C>,
     policy: &'a dyn Policy,
     // The reference time.
     time: SystemTime,
@@ -320,7 +320,7 @@ pub struct ValidComponentAmalgamation<'a, C> {
 impl<'a, C> Clone for ValidComponentAmalgamation<'a, C> {
     fn clone(&self) -> Self {
         Self {
-            a: self.a.clone(),
+            ca: self.ca.clone(),
             policy: self.policy,
             time: self.time,
             binding_signature: self.binding_signature,
@@ -332,7 +332,7 @@ impl<'a, C> std::ops::Deref for ValidComponentAmalgamation<'a, C> {
     type Target = ComponentAmalgamation<'a, C>;
 
     fn deref(&self) -> &Self::Target {
-        &self.a
+        &self.ca
     }
 }
 
@@ -431,7 +431,7 @@ impl<'a, C> Amalgamation<'a, C> for ValidComponentAmalgamation<'a, C> {
               Self: Sized,
     {
         let time = time.into().unwrap_or_else(SystemTime::now);
-        self.a.with_policy(policy, time)
+        self.ca.with_policy(policy, time)
     }
 }
 
-- 
cgit v1.2.3