diff options
author | Robin Krahl <robin.krahl@ireas.org> | 2020-08-23 16:17:42 +0200 |
---|---|---|
committer | Daniel Mueller <deso@posteo.net> | 2020-09-05 11:36:13 -0700 |
commit | 621bc6220a87368c87cd667552438680cae6332a (patch) | |
tree | 0e96b7662beee48f4294753e44c62171dfe81484 /src/tests | |
parent | 940889b26a2fcb59a7dd0410f9efcf5deca30c82 (diff) | |
download | nitrocli-621bc6220a87368c87cd667552438680cae6332a.tar.gz nitrocli-621bc6220a87368c87cd667552438680cae6332a.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.rs | 4 |
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(), |