From 4f37ab793f2a094ce24e010c06d9c71ab95873a7 Mon Sep 17 00:00:00 2001 From: Robin Krahl Date: Sun, 23 Aug 2020 16:17:42 +0200 Subject: 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. --- src/tests/mod.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tests') 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(&mut self, args: &[&str], f: F) -> (R, Vec, Vec) where - F: FnOnce(&mut crate::RunCtx<'_>, Vec) -> R, + F: FnOnce(&mut crate::Context<'_>, Vec) -> 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(), -- cgit v1.2.3