From 4e0618c932b6b63d6663de212581e559cd680a90 Mon Sep 17 00:00:00 2001
From: Justus Winter <justus@sequoia-pgp.org>
Date: Wed, 11 Sep 2019 15:14:13 +0200
Subject: openpgp: Move packet::KeyFlags to constants.

---
 tool/src/commands/inspect.rs | 2 +-
 tool/src/commands/key.rs     | 2 +-
 tool/src/commands/mod.rs     | 2 +-
 tool/src/sq.rs               | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tool')

diff --git a/tool/src/commands/inspect.rs b/tool/src/commands/inspect.rs
index f1b9f625..bb8ed112 100644
--- a/tool/src/commands/inspect.rs
+++ b/tool/src/commands/inspect.rs
@@ -227,7 +227,7 @@ fn inspect_revocation(output: &mut io::Write,
     Ok(())
 }
 
-fn inspect_key_flags(flags: openpgp::packet::KeyFlags) -> Option<String> {
+fn inspect_key_flags(flags: openpgp::constants::KeyFlags) -> Option<String> {
     let mut capabilities = Vec::new();
     if flags.can_certify() {
         capabilities.push("certification")
diff --git a/tool/src/commands/key.rs b/tool/src/commands/key.rs
index 8c765bca..5b048e4a 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::packet::KeyFlags;
+use crate::openpgp::constants::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 f07b5445..f9cbb776 100644
--- a/tool/src/commands/mod.rs
+++ b/tool/src/commands/mod.rs
@@ -88,7 +88,7 @@ pub fn encrypt(store: &mut store::Store,
                input: &mut io::Read, output: &mut io::Write,
                npasswords: usize, recipients: Vec<&str>,
                mut tpks: Vec<openpgp::TPK>, signers: Vec<openpgp::TPK>,
-               mode: KeyFlags,
+               mode: openpgp::constants::KeyFlags,
                compression: &str)
                -> Result<()> {
     for r in recipients {
diff --git a/tool/src/sq.rs b/tool/src/sq.rs
index db0b1339..ac247978 100644
--- a/tool/src/sq.rs
+++ b/tool/src/sq.rs
@@ -26,7 +26,7 @@ extern crate sequoia_store;
 
 use crate::openpgp::{armor, autocrypt, Fingerprint, TPK};
 use crate::openpgp::conversions::hex;
-use crate::openpgp::packet::KeyFlags;
+use crate::openpgp::constants::KeyFlags;
 use crate::openpgp::parse::Parse;
 use crate::openpgp::serialize::Serialize;
 use crate::openpgp::tpk::TPKParser;
-- 
cgit v1.2.3