diff options
-rw-r--r-- | openpgp/src/cert/bundle.rs (renamed from openpgp/src/cert/components.rs) | 0 | ||||
-rw-r--r-- | openpgp/src/cert/key_amalgamation.rs | 2 | ||||
-rw-r--r-- | openpgp/src/cert/mod.rs | 2 | ||||
-rw-r--r-- | openpgp/src/cert/parser/low_level/grammar.lalrpop | 2 | ||||
-rw-r--r-- | openpgp/src/cert/parser/low_level/lexer.rs | 2 | ||||
-rw-r--r-- | openpgp/src/cert/parser/mod.rs | 2 | ||||
-rw-r--r-- | openpgp/src/cert/prelude.rs | 32 |
7 files changed, 21 insertions, 21 deletions
diff --git a/openpgp/src/cert/components.rs b/openpgp/src/cert/bundle.rs index 15227e5b..15227e5b 100644 --- a/openpgp/src/cert/components.rs +++ b/openpgp/src/cert/bundle.rs diff --git a/openpgp/src/cert/key_amalgamation.rs b/openpgp/src/cert/key_amalgamation.rs index 3b138340..7a43bf42 100644 --- a/openpgp/src/cert/key_amalgamation.rs +++ b/openpgp/src/cert/key_amalgamation.rs @@ -42,7 +42,7 @@ use anyhow::Context; use crate::{ Cert, - cert::components::KeyBundle, + cert::bundle::KeyBundle, cert::amalgamation::{ ComponentAmalgamation, ValidAmalgamation, diff --git a/openpgp/src/cert/mod.rs b/openpgp/src/cert/mod.rs index a2038806..79513778 100644 --- a/openpgp/src/cert/mod.rs +++ b/openpgp/src/cert/mod.rs @@ -45,7 +45,7 @@ use crate::types::{ pub mod amalgamation; mod builder; mod bindings; -pub mod components; +pub mod bundle; mod component_iter; mod keyiter; pub mod key_amalgamation; diff --git a/openpgp/src/cert/parser/low_level/grammar.lalrpop b/openpgp/src/cert/parser/low_level/grammar.lalrpop index 1c173180..be22f92f 100644 --- a/openpgp/src/cert/parser/low_level/grammar.lalrpop +++ b/openpgp/src/cert/parser/low_level/grammar.lalrpop @@ -12,7 +12,7 @@ use crate::cert::prelude::*; use crate::cert::parser::low_level::lexer; use crate::cert::parser::low_level::lexer::{Token, Component}; use crate::cert::ComponentBundles; -use crate::cert::components::{ +use crate::cert::bundle::{ PrimaryKeyBundle, SubkeyBundle, UserIDBundle, diff --git a/openpgp/src/cert/parser/low_level/lexer.rs b/openpgp/src/cert/parser/low_level/lexer.rs index cf69f945..05cfbe43 100644 --- a/openpgp/src/cert/parser/low_level/lexer.rs +++ b/openpgp/src/cert/parser/low_level/lexer.rs @@ -3,7 +3,7 @@ use std::fmt; use crate::Error; use crate::Packet; use crate::packet::Tag; -use crate::cert::components::{ +use crate::cert::bundle::{ SubkeyBundle, UserIDBundle, UserAttributeBundle, diff --git a/openpgp/src/cert/parser/mod.rs b/openpgp/src/cert/parser/mod.rs index 00d3fdd3..1a72a516 100644 --- a/openpgp/src/cert/parser/mod.rs +++ b/openpgp/src/cert/parser/mod.rs @@ -16,7 +16,7 @@ use crate::{ PacketParser }, Result, - cert::components::ComponentBundle, + cert::bundle::ComponentBundle, Cert, }; diff --git a/openpgp/src/cert/prelude.rs b/openpgp/src/cert/prelude.rs index 2b1cb2d0..10278021 100644 --- a/openpgp/src/cert/prelude.rs +++ b/openpgp/src/cert/prelude.rs @@ -32,22 +32,22 @@ pub use crate::cert::{ amalgamation::ValidAmalgamation as _, amalgamation::ValidComponentAmalgamation, amalgamation::ValidateAmalgamation as _, - components::ComponentBundle, - components::ComponentBundleIter, - components::ComponentIter, - components::KeyBundle, - components::KeyIter, - components::PrimaryKeyBundle, - components::SubkeyBundle, - components::UnfilteredKeyBundleIter, - components::UnknownBundle, - components::UnknownBundleIter, - components::UserAttributeBundle, - components::UserAttributeBundleIter, - components::UserIDBundle, - components::UserIDBundleIter, - components::ValidComponentIter, - components::ValidKeyIter, + bundle::ComponentBundle, + bundle::ComponentBundleIter, + bundle::ComponentIter, + bundle::KeyBundle, + bundle::KeyIter, + bundle::PrimaryKeyBundle, + bundle::SubkeyBundle, + bundle::UnfilteredKeyBundleIter, + bundle::UnknownBundle, + bundle::UnknownBundleIter, + bundle::UserAttributeBundle, + bundle::UserAttributeBundleIter, + bundle::UserIDBundle, + bundle::UserIDBundleIter, + bundle::ValidComponentIter, + bundle::ValidKeyIter, key_amalgamation::ErasedKeyAmalgamation, key_amalgamation::KeyAmalgamation, key_amalgamation::Primary as _, |