From fafbf4a1bf635d5eea049cf561fbf8aa293c8e2b Mon Sep 17 00:00:00 2001
From: Daniel Mueller <deso@posteo.net>
Date: Sat, 11 Apr 2020 13:23:52 -0700
Subject: Merge remaining bits of args.rs into main.rs

This change removes the args module by moving all remaining
functionality in it into main.rs. The result is arguably a nice
consolidation of all context related definitions in a single module.
---
 src/pinentry.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/pinentry.rs')

diff --git a/src/pinentry.rs b/src/pinentry.rs
index 878ed9e..47c8844 100644
--- a/src/pinentry.rs
+++ b/src/pinentry.rs
@@ -24,8 +24,8 @@ use std::process;
 use std::str;
 
 use crate::arg_defs;
-use crate::args;
 use crate::error::Error;
+use crate::ExecCtx;
 
 type CowStr = borrow::Cow<'static, str>;
 
@@ -222,7 +222,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 args::ExecCtx<'_>,
+  ctx: &mut ExecCtx<'_>,
   entry: &E,
   mode: Mode,
   error_msg: Option<&str>,
@@ -279,7 +279,7 @@ where
   }
 }
 
-pub fn choose<E>(ctx: &mut args::ExecCtx<'_>, entry: &E) -> crate::Result<String>
+pub fn choose<E>(ctx: &mut ExecCtx<'_>, entry: &E) -> crate::Result<String>
 where
   E: SecretEntry,
 {
-- 
cgit v1.2.1