aboutsummaryrefslogtreecommitdiff
path: root/src/pinentry.rs
diff options
context:
space:
mode:
authorRobin Krahl <robin.krahl@ireas.org>2020-08-23 16:17:42 +0200
committerDaniel Mueller <deso@posteo.net>2020-09-03 08:43:05 -0700
commit0cb2ac01371523eae785c12ce88848039090c1e6 (patch)
treee7dfe97cc4bc709cee9fc977f2fae594f3bf0cfb /src/pinentry.rs
parentd180a0d828d46d7672031acbbd7a6f31bf5bf171 (diff)
downloadnitrocli-0cb2ac01371523eae785c12ce88848039090c1e6.tar.gz
nitrocli-0cb2ac01371523eae785c12ce88848039090c1e6.tar.bz2
Merge ExecCtx and RunCtx into Context
Since we moved the model, no_cache and verbosity fields from ExecCtx into Config and added a Config field to both ExecCtx and RunCtx, RunCtx and ExecCtx are identical. Therefore this patch merges the ExecCtx and RunCtx structs into the new Context struct.
Diffstat (limited to 'src/pinentry.rs')
-rw-r--r--src/pinentry.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pinentry.rs b/src/pinentry.rs
index f538a47..937d8df 100644
--- a/src/pinentry.rs
+++ b/src/pinentry.rs
@@ -25,7 +25,7 @@ use std::str;
use anyhow::Context as _;
use crate::args;
-use crate::ExecCtx;
+use crate::Context;
type CowStr = borrow::Cow<'static, str>;
@@ -228,7 +228,7 @@ where
/// dialog. It is used to choose an appropriate description and to
/// decide whether a quality bar is shown in the dialog.
pub fn inquire<E>(
- ctx: &mut ExecCtx<'_>,
+ ctx: &mut Context<'_>,
entry: &E,
mode: Mode,
error_msg: Option<&str>,
@@ -283,7 +283,7 @@ where
}
}
-pub fn choose<E>(ctx: &mut ExecCtx<'_>, entry: &E) -> anyhow::Result<String>
+pub fn choose<E>(ctx: &mut Context<'_>, entry: &E) -> anyhow::Result<String>
where
E: SecretEntry,
{