refactor (borngraced): nits parsing envs

Author: dimxy

mm2src/mm2_main/tests/integration_tests_common/mod.rs

@@ -23,14 +23,14 @@ pub fn test_mm_start_impl() {
     if let Ok(conf) = var("_MM2_TEST_CONF") {
         log!("test_mm_start] Starting the MarketMaker...");
         let conf: Json = json::from_str(&conf).unwrap();
+
         #[cfg(not(target_arch = "wasm32"))]
         let filter = None;
         #[cfg(target_arch = "wasm32")]
-        let filter = if let Ok(log_var) = var("RUST_LOG") {
-            LogLevel::from_str(&log_var).ok(); // Actually filter is used for wasm only. For native RUST_LOG is parsed by env_logger directly, allowing setting multiple targets
-        } else {
-            None
-        };
+        let filter = var("RUST_LOG")
+            .map(|log_var| LogLevel::from_str(&log_var).unwrap_or_default())
+            .ok(); // Actually filter is used for wasm only. For native RUST_LOG is parsed by env_logger directly, allowing setting multiple targets
+
         let params = LpMainParams::with_conf(conf).log_filter(filter);
         let ctx = block_on(lp_main(params, &|_ctx| (), "TEST".into(), "TEST".into())).unwrap();
         block_on(lp_run(ctx))

mm2src/mm2_test_helpers/src/for_tests.rs

@@ -1382,7 +1382,7 @@ impl MarketMakerIt {
                 .env("_MM2_TEST_CONF", try_s!(json::to_string(&conf)))
                 .env("MM2_UNBUFFERED_OUTPUT", "1")
                 .env("RUST_LOG", read_rust_log().as_str())
-                .envs(envs_fixed.iter().map(|(k, v)| (k, v)))
+                .envs(envs_fixed.into_iter())
                 .stdout(try_s!(log.try_clone()))
                 .stderr(log)
                 .spawn());