diff options
author | Neal H. Walfield <neal@pep.foundation> | 2021-08-27 14:40:30 +0200 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2021-10-05 14:10:53 +0200 |
commit | 30ae9da9de1b7ed1c991bfae68d8e37c122937e9 (patch) | |
tree | 2243c95829bc11baaed4ce65c47b5aa34ea54a03 | |
parent | 4eb79a5dd7c1bc39ba568828f4510c5893088f74 (diff) |
Fix typos.
-rw-r--r-- | buffered-reader/src/lib.rs | 2 | ||||
-rw-r--r-- | openpgp/src/cert.rs | 26 | ||||
-rw-r--r-- | openpgp/src/cert/amalgamation.rs | 2 | ||||
-rw-r--r-- | openpgp/src/cert/bindings.rs | 26 |
4 files changed, 28 insertions, 28 deletions
diff --git a/buffered-reader/src/lib.rs b/buffered-reader/src/lib.rs index 1ee7514b..89b897ea 100644 --- a/buffered-reader/src/lib.rs +++ b/buffered-reader/src/lib.rs @@ -549,7 +549,7 @@ pub trait BufferedReader<C> : io::Read + fmt::Debug + fmt::Display + Send + Sync /// } /// /// // Like `data()`, `data_consume()` may return and consume less - /// // than request if there is no more data available. + /// // than requested if there is no more data available. /// { /// let buffer = br.data_consume(10)?; /// assert_eq!(buffer, &orig[6..6 + buffer.len()]); diff --git a/openpgp/src/cert.rs b/openpgp/src/cert.rs index a8a9f65a..50959497 100644 --- a/openpgp/src/cert.rs +++ b/openpgp/src/cert.rs @@ -1645,27 +1645,27 @@ impl Cert { self.primary, other_revocations, lookup_fn, verify_primary_key_revocation, hash_direct_key); - for binding in self.userids.iter_mut() { + for ua in self.userids.iter_mut() { check!(format!("userid \"{}\"", - String::from_utf8_lossy(binding.userid().value())), - binding, self_signatures, verify_userid_binding, - binding.userid()); + String::from_utf8_lossy(ua.userid().value())), + ua, self_signatures, verify_userid_binding, + ua.userid()); check!(format!("userid \"{}\"", - String::from_utf8_lossy(binding.userid().value())), - binding, self_revocations, verify_userid_revocation, - binding.userid()); + String::from_utf8_lossy(ua.userid().value())), + ua, self_revocations, verify_userid_revocation, + ua.userid()); check_3rd_party!( format!("userid \"{}\"", - String::from_utf8_lossy(binding.userid().value())), - binding, certifications, lookup_fn, + String::from_utf8_lossy(ua.userid().value())), + ua, certifications, lookup_fn, verify_userid_binding, hash_userid_binding, - binding.userid()); + ua.userid()); check_3rd_party!( format!("userid \"{}\"", - String::from_utf8_lossy(binding.userid().value())), - binding, other_revocations, lookup_fn, + String::from_utf8_lossy(ua.userid().value())), + ua, other_revocations, lookup_fn, verify_userid_revocation, hash_userid_binding, - binding.userid()); + ua.userid()); } for binding in self.user_attributes.iter_mut() { diff --git a/openpgp/src/cert/amalgamation.rs b/openpgp/src/cert/amalgamation.rs index 90350d86..6b28c3be 100644 --- a/openpgp/src/cert/amalgamation.rs +++ b/openpgp/src/cert/amalgamation.rs @@ -274,7 +274,7 @@ pub mod key; /// [`ValidComponentAmalgamation`], and a [`KeyAmalgamation`] into a /// [`ValidKeyAmalgamation`]. /// -/// A certificate or a component is consider valid if: +/// A certificate or a component is considered valid if: /// /// - It has a self signature that is live at time `t`. /// diff --git a/openpgp/src/cert/bindings.rs b/openpgp/src/cert/bindings.rs index e0d692f1..5e347c60 100644 --- a/openpgp/src/cert/bindings.rs +++ b/openpgp/src/cert/bindings.rs @@ -81,7 +81,7 @@ impl<P: key::KeyParts> Key<P, key::SubordinateRole> { impl UserID { /// Creates a binding signature. /// - /// The signature binds this userid to `cert`. `signer` will be used + /// The signature binds this User ID to `cert`. `signer` will be used /// to create a signature using `signature` as builder. /// The`hash_algo` defaults to SHA512, `creation_time` to the /// current time. @@ -92,9 +92,9 @@ impl UserID { /// /// # Examples /// - /// This example demonstrates how to bind this userid to a Cert. + /// This example demonstrates how to bind this User ID to a Cert. /// Note that in general, the `CertBuilder` is a better way to add - /// userids to a Cert. + /// User IDs to a Cert. /// /// ``` /// # use sequoia_openpgp::{*, packet::prelude::*, types::*, cert::*}; @@ -105,17 +105,17 @@ impl UserID { /// .parts_into_secret()?.into_keypair()?; /// assert_eq!(cert.userids().len(), 0); /// - /// // Generate a userid and a binding signature. + /// // Generate a User ID and a binding signature. /// let userid = UserID::from("test@example.org"); /// let builder = /// signature::SignatureBuilder::new(SignatureType::PositiveCertification); /// let binding = userid.bind(&mut keypair, &cert, builder)?; /// - /// // Now merge the userid and binding signature into the Cert. + /// // Now merge the User ID and binding signature into the Cert. /// let cert = cert.insert_packets(vec![Packet::from(userid), /// binding.into()])?; /// - /// // Check that we have a userid. + /// // Check that we have a User ID. /// assert_eq!(cert.userids().len(), 1); /// # Ok(()) } pub fn bind(&self, signer: &mut dyn Signer, cert: &Cert, @@ -126,9 +126,9 @@ impl UserID { signer, cert.primary_key().key(), self) } - /// Returns a certification for the user id. + /// Returns a certification for the User ID. /// - /// The signature binds this userid to `cert`. `signer` will be + /// The signature binds this User ID to `cert`. `signer` will be /// used to create a certification signature of type /// `signature_type`. `signature_type` defaults to /// `SignatureType::GenericCertification`, `hash_algo` to SHA512, @@ -146,7 +146,7 @@ impl UserID { /// /// # Examples /// - /// This example demonstrates how to certify a userid. + /// This example demonstrates how to certify a User ID. /// /// ``` /// # use sequoia_openpgp::{*, packet::prelude::*, types::*, cert::*}; @@ -174,7 +174,7 @@ impl UserID { /// // `certification` can now be used, e.g. by merging it into `bob`. /// let bob = bob.insert_packets(certification)?; /// - /// // Check that we have a certification on the userid. + /// // Check that we have a certification on the User ID. /// assert_eq!(bob.userids().nth(0).unwrap() /// .certifications().count(), 1); /// # Ok(()) } @@ -223,7 +223,7 @@ impl UserAttribute { /// /// This example demonstrates how to bind this user attribute to a /// Cert. Note that in general, the `CertBuilder` is a better way - /// to add userids to a Cert. + /// to add User IDs to a Cert. /// /// ``` /// # use sequoia_openpgp::{*, packet::prelude::*, types::*, cert::*, @@ -280,7 +280,7 @@ impl UserAttribute { /// /// # Examples /// - /// This example demonstrates how to certify a userid. + /// This example demonstrates how to certify a User ID. /// /// ``` /// # use sequoia_openpgp::{*, packet::prelude::*, types::*, cert::*, @@ -312,7 +312,7 @@ impl UserAttribute { /// // `certification` can now be used, e.g. by merging it into `bob`. /// let bob = bob.insert_packets(certification)?; /// - /// // Check that we have a certification on the userid. + /// // Check that we have a certification on the User ID. /// assert_eq!(bob.user_attributes().nth(0).unwrap() /// .certifications().count(), /// 1); |