From 1d2e45191d10da7bb3bbbe6962ab28d1f26d11ee Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Thu, 11 May 2023 13:19:02 +0200 Subject: [PATCH] Make Debug impl for RequestConfig less verbose MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … for the common case, and more verbose for some uncommon options that were just never printed before. --- crates/matrix-sdk/src/config/request.rs | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/crates/matrix-sdk/src/config/request.rs b/crates/matrix-sdk/src/config/request.rs index 7a51d2b10..ed0ec62e4 100644 --- a/crates/matrix-sdk/src/config/request.rs +++ b/crates/matrix-sdk/src/config/request.rs @@ -17,6 +17,8 @@ use std::{ time::Duration, }; +use matrix_sdk_common::debug::DebugStructExt; + use crate::http_client::DEFAULT_REQUEST_TIMEOUT; /// Configuration for requests the `Client` makes. @@ -49,12 +51,21 @@ pub struct RequestConfig { #[cfg(not(tarpaulin_include))] impl Debug for RequestConfig { fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result { - let mut res = fmt.debug_struct("RequestConfig"); + let Self { timeout, retry_limit, retry_timeout, force_auth, assert_identity } = self; - res.field("timeout", &self.timeout) - .field("retry_limit", &self.retry_limit) - .field("retry_timeout", &self.retry_timeout) - .finish() + let mut res = fmt.debug_struct("RequestConfig"); + res.field("timeout", timeout) + .maybe_field("retry_limit", retry_limit) + .maybe_field("retry_timeout", retry_timeout); + + if *force_auth { + res.field("force_auth", &true); + } + if *assert_identity { + res.field("assert_identity", &true); + } + + res.finish() } }