diff options
62 files changed, 387 insertions, 408 deletions
diff --git a/openpgp-ffi/src/amalgamation.rs b/openpgp-ffi/src/amalgamation.rs index f351c6ac..697eff79 100644 --- a/openpgp-ffi/src/amalgamation.rs +++ b/openpgp-ffi/src/amalgamation.rs @@ -3,7 +3,7 @@ //! //! Wraps [`sequoia-openpgp::cert::key_amalgamation::KeyAmalgamation`]. //! -//! [`sequoia-openpgp::cert::key_amalgamation::KeyAmalgamation`]: super::super::super::sequoia_openpgp::cert::key_amalgamation::KeyAmalgamation +//! [`sequoia-openpgp::cert::key_amalgamation::KeyAmalgamation`]: sequoia_openpgp::cert::key_amalgamation::KeyAmalgamation use libc::time_t; @@ -32,7 +32,7 @@ type UserIDAmalgamationType<'a> /// /// Wraps [`sequoia-openpgp::cert::amalgamation::ComponentAmalgamation`]. /// -/// [`sequoia-openpgp::cert::amalgamation::ComponentAmalgamation`]: super::super::super::sequoia_openpgp::cert::amalgamation::ComponentAmalgamation +/// [`sequoia-openpgp::cert::amalgamation::ComponentAmalgamation`]: sequoia_openpgp::cert::amalgamation::ComponentAmalgamation #[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Clone, Debug")] pub struct UserIDAmalgamation<'a>(UserIDAmalgamationType<'a>); @@ -56,7 +56,7 @@ type ValidUserIDAmalgamationType<'a> /// /// Wraps [`sequoia-openpgp::cert::amalgamation::ValidComponentAmalgamation`]. /// -/// [`sequoia-openpgp::cert::amalgamation::ValidComponentAmalgamation`]: super::super::super::sequoia_openpgp::cert::amalgamation::ValidComponentAmalgamation +/// [`sequoia-openpgp::cert::amalgamation::ValidComponentAmalgamation`]: sequoia_openpgp::cert::amalgamation::ValidComponentAmalgamation #[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Clone, Debug")] pub struct ValidUserIDAmalgamation<'a>(ValidUserIDAmalgamationType<'a>); diff --git a/openpgp-ffi/src/armor.rs b/openpgp-ffi/src/armor.rs index a1c42a22..469c0e48 100644 --- a/openpgp-ffi/src/armor.rs +++ b/openpgp-ffi/src/armor.rs @@ -2,7 +2,7 @@ //! //! Wraps [`sequoia-openpgp::armor`]. //! -//! [`sequoia-openpgp::armor`]: super::super::super::sequoia_openpgp::armor +//! [`sequoia-openpgp::armor`]: sequoia_openpgp::armor use std::mem::size_of; use std::ptr; diff --git a/openpgp-ffi/src/cert.rs b/openpgp-ffi/src/cert.rs index cf503019..03ca1c7d 100644 --- a/openpgp-ffi/src/cert.rs +++ b/openpgp-ffi/src/cert.rs @@ -2,8 +2,8 @@ //! //! Wraps [`sequoia-openpgp::Cert`] and [related functionality]. //! -//! [`sequoia-openpgp::Cert`]: super::super::super::sequoia_openpgp::cert::Cert -//! [related functionality]: super::super::super::sequoia_openpgp::cert +//! [`sequoia-openpgp::Cert`]: sequoia_openpgp::cert::Cert +//! [related functionality]: sequoia_openpgp::cert use std::convert::TryFrom; use std::ptr; diff --git a/openpgp-ffi/src/crypto.rs b/openpgp-ffi/src/crypto.rs index ffc77c1e..60e7f18c 100644 --- a/openpgp-ffi/src/crypto.rs +++ b/openpgp-ffi/src/crypto.rs @@ -2,7 +2,7 @@ //! //! Wraps [`sequoia-openpgp::crypto`]. //! -//! [`sequoia-openpgp::crypto`]: super::super::super::sequoia_openpgp::crypto +//! [`sequoia-openpgp::crypto`]: sequoia_openpgp::crypto use libc::size_t; diff --git a/openpgp-ffi/src/fingerprint.rs b/openpgp-ffi/src/fingerprint.rs index 6bb7ea80..429b83d9 100644 --- a/openpgp-ffi/src/fingerprint.rs +++ b/openpgp-ffi/src/fingerprint.rs @@ -8,7 +8,7 @@ //! //! Wraps [`sequoia-openpgp::Fingerprint`]. //! -//! [`sequoia-openpgp::Fingerprint`]: super::super::super::sequoia_openpgp::Fingerprint +//! [`sequoia-openpgp::Fingerprint`]: sequoia_openpgp::Fingerprint use std::slice; use libc::{c_char, size_t}; @@ -29,7 +29,7 @@ use crate::RefRaw; /// /// Wraps [`sequoia-openpgp::Fingerprint`]. /// -/// [`sequoia-openpgp::Fingerprint`]: super::super::super::sequoia_openpgp::Fingerprint +/// [`sequoia-openpgp::Fingerprint`]: sequoia_openpgp::Fingerprint #[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Clone, Debug, Display, Hash, PartialEq")] pub struct Fingerprint(openpgp::Fingerprint); diff --git a/openpgp-ffi/src/key_amalgamation.rs b/openpgp-ffi/src/key_amalgamation.rs index 2c9efebb..94ffcb39 100644 --- a/openpgp-ffi/src/key_amalgamation.rs +++ b/openpgp-ffi/src/key_amalgamation.rs @@ -3,7 +3,7 @@ //! //! Wraps [`sequoia-openpgp::cert::key_amalgamation::KeyAmalgamation`]. //! -//! [`sequoia-openpgp::cert::key_amalgamation::KeyAmalgamation`]: super::super::super::sequoia_openpgp::cert::key_amalgamation::KeyAmalgamation +//! [`sequoia-openpgp::cert::key_amalgamation::KeyAmalgamation`]: sequoia_openpgp::cert::key_amalgamation::KeyAmalgamation use std::slice; use libc::{size_t, time_t}; @@ -35,7 +35,7 @@ type ErasedKeyAmalgamation<'a> = /// /// Wraps [`sequoia-openpgp::cert::key_amalgamation::KeyAmalgamation`]. /// -/// [`sequoia-openpgp::cert::key_amalgamation::KeyAmalgamation`]: super::super::super::sequoia_openpgp::cert::key_amalgamation::KeyAmalgamation +/// [`sequoia-openpgp::cert::key_amalgamation::KeyAmalgamation`]: sequoia_openpgp::cert::key_amalgamation::KeyAmalgamation #[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Clone, Debug")] pub struct KeyAmalgamation<'a>(ErasedKeyAmalgamation<'a>); @@ -60,7 +60,7 @@ pub extern "C" fn pgp_key_amalgamation_key<'a>(ka: *const KeyAmalgamation<'a>) /// /// Wraps [`sequoia-openpgp::cert::key_amalgamation::ValidKeyAmalgamation`]. /// -/// [`sequoia-openpgp::cert::key_amalgamation::ValidKeyAmalgamation`]: super::super::super::sequoia_openpgp::cert::key_amalgamation::ValidKeyAmalgamation +/// [`sequoia-openpgp::cert::key_amalgamation::ValidKeyAmalgamation`]: sequoia_openpgp::cert::key_amalgamation::ValidKeyAmalgamation #[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Clone, Debug")] pub struct ValidKeyAmalgamation<'a>(ValidErasedKeyAmalgamation<'a>); diff --git a/openpgp-ffi/src/keyid.rs b/openpgp-ffi/src/keyid.rs index f45555aa..ee07bf10 100644 --- a/openpgp-ffi/src/keyid.rs +++ b/openpgp-ffi/src/keyid.rs @@ -8,7 +8,7 @@ //! //! Wraps [`sequoia-openpgp::KeyID`]. //! -//! [`sequoia-openpgp::KeyID`]: super::super::super::sequoia_openpgp::KeyID +//! [`sequoia-openpgp::KeyID`]: sequoia_openpgp::KeyID use std::slice; use libc::{c_char}; @@ -29,7 +29,7 @@ use crate::MoveIntoRaw; /// /// Wraps [`sequoia-openpgp::KeyID`]. /// -/// [`sequoia-openpgp::KeyID`]: super::super::super::sequoia_openpgp::KeyID +/// [`sequoia-openpgp::KeyID`]: sequoia_openpgp::KeyID #[crate::ffi_wrapper_type(prefix = "pgp_", name = "keyid", derive = "Clone, Debug, Display, Hash, PartialEq")] pub struct KeyID(openpgp::KeyID); diff --git a/openpgp-ffi/src/lib.rs b/openpgp-ffi/src/lib.rs index 2b27d386..b0b2142e 100644 --- a/openpgp-ffi/src/lib.rs +++ b/openpgp-ffi/src/lib.rs @@ -70,7 +70,7 @@ //! closely resembles this crate. //! //! [The Rules]: #the-rules -//! [corresponding Rust crate]: super::sequoia_openpgp +//! [corresponding Rust crate]: sequoia_openpgp //! //! //! # Examples diff --git a/openpgp-ffi/src/packet/key.rs b/openpgp-ffi/src/packet/key.rs index 2a2386c5..9fffc001 100644 --- a/openpgp-ffi/src/packet/key.rs +++ b/openpgp-ffi/src/packet/key.rs @@ -29,7 +29,7 @@ type UnspecifiedKey = /// /// Wraps [`sequoia-openpgp::packet::Key`]. /// -/// [`sequoia-openpgp::packet::key::Key`]: super::super::super::super::sequoia_openpgp::packet::Key +/// [`sequoia-openpgp::packet::key::Key`]: sequoia_openpgp::packet::Key #[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Clone, Debug, PartialEq, Parse")] pub struct Key(UnspecifiedKey); diff --git a/openpgp-ffi/src/packet/literal.rs b/openpgp-ffi/src/packet/literal.rs index 65ddaaa3..7294dee3 100644 --- a/openpgp-ffi/src/packet/literal.rs +++ b/openpgp-ffi/src/packet/literal.rs @@ -26,9 +26,7 @@ use crate::RefRaw; /// /// [Section 5.8 of RFC 4880]: https://tools.ietf.org/html/rfc4880#section-5.8 /// -/// Wraps [`sequoia-openpgp::packet::literal::Literal`]. -/// -/// [`sequoia-openpgp::packet::literal::Literal`]: super::super::super::super::sequoia_openpgp::packet::literal::Literal +/// Wraps [`sequoia-openpgp::packet::Literal`]. #[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Debug, Parse")] pub struct Literal(openpgp::packet::Literal); diff --git a/openpgp-ffi/src/packet/mod.rs b/openpgp-ffi/src/packet/mod.rs index d8727590..4df75d5c 100644 --- a/openpgp-ffi/src/packet/mod.rs +++ b/openpgp-ffi/src/packet/mod.rs @@ -43,7 +43,7 @@ use crate::RefRaw; /// /// Wraps [`sequoia-openpgp::Packet`]. /// -/// [`sequoia-openpgp::Packet`]: super::super::super::sequoia_openpgp::Packet +/// [`sequoia-openpgp::Packet`]: sequoia_openpgp::Packet #[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Clone, Debug, Hash, PartialEq")] pub struct Packet(openpgp::Packet); diff --git a/openpgp-ffi/src/packet/signature.rs b/openpgp-ffi/src/packet/signature.rs index 5705900d..a208cf3d 100644 --- a/openpgp-ffi/src/packet/signature.rs +++ b/openpgp-ffi/src/packet/signature.rs @@ -34,7 +34,7 @@ use crate::RefRaw; /// /// Wraps [`sequoia-openpgp::packet::Signature`]. /// -/// [`sequoia-openpgp::packet::Signature`]: super::super::super::super::sequoia_openpgp::packet::Signature +/// [`sequoia-openpgp::packet::Signature`]: sequoia_openpgp::packet::Signature #[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Clone, Debug, PartialEq, Parse")] pub struct Signature(openpgp::packet::Signature); diff --git a/openpgp-ffi/src/packet/userid.rs b/openpgp-ffi/src/packet/userid.rs index 796e4778..89febc06 100644 --- a/openpgp-ffi/src/packet/userid.rs +++ b/openpgp-ffi/src/packet/userid.rs @@ -20,7 +20,7 @@ use crate::MoveIntoRaw; /// /// Wraps [`sequoia-openpgp::packet::UserID`]. /// -/// [`sequoia-openpgp::packet::UserID`]: super::super::super::sequoia_openpgp::packet::UserID +/// [`sequoia-openpgp::packet::UserID`]: sequoia_openpgp::packet::UserID #[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Clone, Debug, PartialEq")] pub struct UserID(openpgp::packet::UserID); diff --git a/openpgp-ffi/src/packet_pile.rs b/openpgp-ffi/src/packet_pile.rs index 3a64a3c3..7a7d17a6 100644 --- a/openpgp-ffi/src/packet_pile.rs +++ b/openpgp-ffi/src/packet_pile.rs @@ -3,7 +3,7 @@ //! //! Wraps [`sequoia-openpgp::PacketPile`]. //! -//! [`sequoia-openpgp::PacketPile`]: super::super::super::sequoia_openpgp::PacketPile +//! [`sequoia-openpgp::PacketPile`]: sequoia_openpgp::PacketPile use sequoia_openpgp as openpgp; @@ -11,7 +11,7 @@ use sequoia_openpgp as openpgp; /// /// Wraps [`sequoia-openpgp::PacketPile`]. /// -/// [`sequoia-openpgp::PacketPile`]: super::super::super::sequoia_openpgp::PacketPile +/// [`sequoia-openpgp::PacketPile`]: sequoia_openpgp::PacketPile #[crate::ffi_wrapper_type(prefix = "pgp_", derive = "Clone, Debug, PartialEq, Parse, Serialize")] pub struct PacketPile(openpgp::PacketPile); diff --git a/openpgp-ffi/src/parse/mod.rs b/openpgp-ffi/src/parse/mod.rs index 7372fd72..79f6c63d 100644 --- a/openpgp-ffi/src/parse/mod.rs +++ b/openpgp-ffi/src/parse/mod.rs @@ -3,8 +3,8 @@ //! Wraps [`sequoia-openpgp::parse::PacketParser`] and [related //! functionality]. //! -//! [`sequoia-openpgp::parse::PacketParser`]: super::super::super::sequoia_openpgp::parse::PacketParser -//! [related functionality]: super::super::super::sequoia_openpgp::parse +//! [`sequoia-openpgp::parse::PacketParser`]: sequoia_openpgp::parse::PacketParser +//! [related functionality]: sequoia_openpgp::parse use std::mem::forget; use std::ptr; @@ -140,7 +140,7 @@ pub extern "C" fn pgp_packet_parser_recursion_depth /// recurse into the container, but skips any packets it contains. /// To recurse into the container, use the [`recurse()`] method. /// -/// [`PacketParsererBuilder`]: super::super::super::sequoia_openpgp::parse::PacketParserBuilder +/// [`PacketParsererBuilder`]: sequoia_openpgp::parse::PacketParserBuilder /// [`recurse()`]: pgp_packet_parser_recurse() /// /// The return value is a tuple containing: diff --git a/openpgp-ffi/src/parse/stream.rs b/openpgp-ffi/src/parse/stream.rs index 653c152b..52932e70 100644 --- a/openpgp-ffi/src/parse/stream.rs +++ b/openpgp-ffi/src/parse/stream.rs @@ -8,7 +8,7 @@ //! Wraps the streaming parsing functions, see //! [`seq |