diff --git a/ipa-core/src/helpers/transport/query/mod.rs b/ipa-core/src/helpers/transport/query/mod.rs index 1efdcb0c1..f7c411bc7 100644 --- a/ipa-core/src/helpers/transport/query/mod.rs +++ b/ipa-core/src/helpers/transport/query/mod.rs @@ -246,22 +246,21 @@ impl QueryInputRequest { } } -/* -impl From<(Addr, BodyStream)> for QueryInput { - fn from((addr, body): (Addr, BodyStream)) -> Self { - if addr.params.is_empty() { - QueryInput::Inline { addr.query_id, input_stream: body }, - } else { - QueryInput::FromUrl { query_id, url }, - } - } -} -*/ - impl Debug for QueryInput { fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result { - todo!() - //write!(f, "query_inputs[{:?}]", self.query_id) + match self { + QueryInput::Inline { query_id, input_stream: _ } => { + f.debug_struct("QueryInput::Inline") + .field("query_id", query_id) + .finish() + } + QueryInput::FromUrl { query_id, url } => { + f.debug_struct("QueryInput::FromUrl") + .field("query_id", query_id) + .field("url", url) + .finish() + } + } } } diff --git a/ipa-core/src/net/http_serde.rs b/ipa-core/src/net/http_serde.rs index adfa631a4..2f1edf90e 100644 --- a/ipa-core/src/net/http_serde.rs +++ b/ipa-core/src/net/http_serde.rs @@ -382,13 +382,6 @@ pub mod query { self.0 } } - - // TODO: remove this if unused - impl QueryInputUrl { - pub fn as_ref(&self) -> Option<&Uri> { - self.0.as_ref() - } - } } pub mod step {