openpgp: Rename openpgp::constants to openpgp::types.

  - Fixes #381.

7 files changed, 9 insertions, 9 deletions

diff --git a/tool/src/commands/decrypt.rs b/tool/src/commands/decrypt.rs
index 3e942fe4..095e247a 100644
--- a/tool/src/commands/decrypt.rs
+++ b/tool/src/commands/decrypt.rs
@@ -6,7 +6,7 @@ extern crate termsize;
 
 extern crate sequoia_openpgp as openpgp;
 use sequoia_core::Context;
-use crate::openpgp::constants::SymmetricAlgorithm;
+use crate::openpgp::types::SymmetricAlgorithm;
 use crate::openpgp::conversions::hex;
 use crate::openpgp::crypto::{self, SessionKey};
 use crate::openpgp::{Fingerprint, TPK, KeyID, Result};
diff --git a/tool/src/commands/dump.rs b/tool/src/commands/dump.rs
index 5ce50681..319c6e16 100644
--- a/tool/src/commands/dump.rs
+++ b/tool/src/commands/dump.rs
@@ -1,7 +1,7 @@
 use std::io::{self, Read};
 
 extern crate sequoia_openpgp as openpgp;
-use self::openpgp::constants::SymmetricAlgorithm;
+use self::openpgp::types::SymmetricAlgorithm;
 use self::openpgp::conversions::hex;
 use self::openpgp::crypto::mpis;
 use self::openpgp::{Packet, Result};
diff --git a/tool/src/commands/inspect.rs b/tool/src/commands/inspect.rs
index 3f75daf0..ef3692aa 100644
--- a/tool/src/commands/inspect.rs
+++ b/tool/src/commands/inspect.rs
@@ -227,7 +227,7 @@ fn inspect_revocation(output: &mut dyn io::Write,
     Ok(())
 }
 
-fn inspect_key_flags(flags: openpgp::constants::KeyFlags) -> Option<String> {
+fn inspect_key_flags(flags: openpgp::types::KeyFlags) -> Option<String> {
     let mut capabilities = Vec::new();
     if flags.can_certify() {
         capabilities.push("certification")
@@ -254,7 +254,7 @@ fn inspect_key_flags(flags: openpgp::constants::KeyFlags) -> Option<String> {
 
 fn inspect_signatures(output: &mut dyn io::Write,
                       sigs: &[openpgp::packet::Signature]) -> Result<()> {
-    use crate::openpgp::constants::SignatureType::*;
+    use crate::openpgp::types::SignatureType::*;
     for sig in sigs {
         match sig.typ() {
             Binary | Text => (),
diff --git a/tool/src/commands/key.rs b/tool/src/commands/key.rs
index f4afe93e..16945252 100644
--- a/tool/src/commands/key.rs
+++ b/tool/src/commands/key.rs
@@ -5,7 +5,7 @@ use itertools::Itertools;
 
 use crate::openpgp::Packet;
 use crate::openpgp::tpk::{TPKBuilder, CipherSuite};
-use crate::openpgp::constants::KeyFlags;
+use crate::openpgp::types::KeyFlags;
 use crate::openpgp::armor::{Writer, Kind};
 use crate::openpgp::serialize::Serialize;
 
diff --git a/tool/src/commands/mod.rs b/tool/src/commands/mod.rs
index af7469ca..9bdb548a 100644
--- a/tool/src/commands/mod.rs
+++ b/tool/src/commands/mod.rs
@@ -7,7 +7,7 @@ use rpassword;
 
 extern crate sequoia_openpgp as openpgp;
 use sequoia_core::Context;
-use crate::openpgp::constants::{
+use crate::openpgp::types::{
     CompressionAlgorithm,
 };
 use crate::openpgp::crypto;
@@ -82,7 +82,7 @@ pub fn encrypt(mapping: &mut store::Mapping,
                input: &mut dyn io::Read, output: &mut dyn io::Write,
                npasswords: usize, recipients: Vec<&str>,
                mut tpks: Vec<openpgp::TPK>, signers: Vec<openpgp::TPK>,
-               mode: openpgp::constants::KeyFlags,
+               mode: openpgp::types::KeyFlags,
                compression: &str)
                -> Result<()> {
     for r in recipients {
diff --git a/tool/src/sq.rs b/tool/src/sq.rs
index 2cc870ba..6bad4399 100644
--- a/tool/src/sq.rs
+++ b/tool/src/sq.rs
@@ -25,7 +25,7 @@ extern crate sequoia_store as store;
 
 use crate::openpgp::{armor, autocrypt, Fingerprint, TPK};
 use crate::openpgp::conversions::hex;
-use crate::openpgp::constants::KeyFlags;
+use crate::openpgp::types::KeyFlags;
 use crate::openpgp::parse::Parse;
 use crate::openpgp::serialize::Serialize;
 use crate::openpgp::tpk::TPKParser;
diff --git a/tool/tests/sq-sign.rs b/tool/tests/sq-sign.rs
index 00868515..3a83987a 100644
--- a/tool/tests/sq-sign.rs
+++ b/tool/tests/sq-sign.rs
@@ -10,7 +10,7 @@ extern crate sequoia_openpgp as openpgp;
 use crate::openpgp::{Packet, PacketPile, TPK};
 use crate::openpgp::crypto::KeyPair;
 use crate::openpgp::packet::key::SecretKeyMaterial;
-use crate::openpgp::constants::{CompressionAlgorithm, SignatureType};
+use crate::openpgp::types::{CompressionAlgorithm, SignatureType};
 use crate::openpgp::parse::Parse;
 use crate::openpgp::serialize::stream::{Message, Signer, Compressor, LiteralWriter};