aboutsummaryrefslogtreecommitdiff
path: root/src/tests
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/tests
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/tests')
-rw-r--r--src/tests/mod.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/tests/mod.rs b/src/tests/mod.rs
index 9477964..3c38b8e 100644
--- a/src/tests/mod.rs
+++ b/src/tests/mod.rs
@@ -94,7 +94,7 @@ impl Nitrocli {
fn do_run<F, R>(&mut self, args: &[&str], f: F) -> (R, Vec<u8>, Vec<u8>)
where
- F: FnOnce(&mut crate::RunCtx<'_>, Vec<String>) -> R,
+ F: FnOnce(&mut crate::Context<'_>, Vec<String>) -> R,
{
let args = ["nitrocli"]
.iter()
@@ -107,7 +107,7 @@ impl Nitrocli {
let mut stdout = Vec::new();
let mut stderr = Vec::new();
- let ctx = &mut crate::RunCtx {
+ let ctx = &mut crate::Context {
stdout: &mut stdout,
stderr: &mut stderr,
admin_pin: self.admin_pin.clone(),