[server raw params]: fix debug implementation (#137)

* [server]: simply raw params impl

Use debug implementation of `common::Params` instead of doing something
similar that doesn't work properly.

* [raw params]: derive `Debug` impl.

Author: niklasad1

src/common/params.rs

@@ -79,7 +79,6 @@ impl From<Params> for JsonValue {
 mod tests {
 	use super::Params;
 	use crate::common::{Error, ErrorCode, JsonValue};
-	use serde_json;
 
 	#[test]
 	fn params_deserialization() {

src/http/raw/params.rs

@@ -30,7 +30,7 @@ use alloc::string::String;
 use core::fmt;
 
 /// Access to the parameters of a request.
-#[derive(Copy, Clone)]
+#[derive(Copy, Debug, Clone)]
 pub struct Params<'a> {
 	/// Raw parameters of the request.
 	params: &'a common::Params,
@@ -80,7 +80,7 @@ impl<'a> Params<'a> {
 }
 
 impl<'a> IntoIterator for Params<'a> {
-	type Item = (ParamKey<'a>, &'a common::JsonValue);
+	type Item = Entry<'a>;
 	type IntoIter = Iter<'a>;
 
 	fn into_iter(self) -> Self::IntoIter {
@@ -92,12 +92,6 @@ impl<'a> IntoIterator for Params<'a> {
 	}
 }
 
-impl<'a> fmt::Debug for Params<'a> {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		f.debug_map().entries(self.into_iter()).finish()
-	}
-}
-
 impl<'a> AsRef<common::Params> for Params<'a> {
 	fn as_ref(&self) -> &common::Params {
 		self.params
@@ -146,14 +140,20 @@ enum IterInner<'a> {
 	Array(std::slice::Iter<'a, serde_json::Value>),
 }
 
+#[derive(Debug)]
+pub enum Entry<'a> {
+	Value(&'a common::JsonValue),
+	KeyValue(ParamKey<'a>, &'a common::JsonValue),
+}
+
 impl<'a> Iterator for Iter<'a> {
-	type Item = (ParamKey<'a>, &'a common::JsonValue);
+	type Item = Entry<'a>;
 
 	fn next(&mut self) -> Option<Self::Item> {
 		match &mut self.0 {
 			IterInner::Empty => None,
-			IterInner::Map(iter) => iter.next().map(|(k, v)| (ParamKey::String(&k[..]), v)),
-			IterInner::Array(iter) => iter.next().map(|v| (ParamKey::String(""), v)),
+			IterInner::Map(iter) => iter.next().map(|(k, v)| Entry::KeyValue(ParamKey::String(&k[..]), v)),
+			IterInner::Array(iter) => iter.next().map(|v| Entry::Value(v)),
 		}
 	}
 

src/ws/raw/params.rs

@@ -30,7 +30,7 @@ use alloc::string::String;
 use core::fmt;
 
 /// Access to the parameters of a request.
-#[derive(Copy, Clone)]
+#[derive(Copy, Debug, Clone)]
 pub struct Params<'a> {
 	/// Raw parameters of the request.
 	params: &'a common::Params,
@@ -80,7 +80,7 @@ impl<'a> Params<'a> {
 }
 
 impl<'a> IntoIterator for Params<'a> {
-	type Item = (ParamKey<'a>, &'a common::JsonValue);
+	type Item = Entry<'a>;
 	type IntoIter = Iter<'a>;
 
 	fn into_iter(self) -> Self::IntoIter {
@@ -92,12 +92,6 @@ impl<'a> IntoIterator for Params<'a> {
 	}
 }
 
-impl<'a> fmt::Debug for Params<'a> {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		f.debug_map().entries(self.into_iter()).finish()
-	}
-}
-
 impl<'a> AsRef<common::Params> for Params<'a> {
 	fn as_ref(&self) -> &common::Params {
 		self.params
@@ -146,14 +140,20 @@ enum IterInner<'a> {
 	Array(std::slice::Iter<'a, serde_json::Value>),
 }
 
+#[derive(Debug)]
+pub enum Entry<'a> {
+	Value(&'a common::JsonValue),
+	KeyValue(ParamKey<'a>, &'a common::JsonValue),
+}
+
 impl<'a> Iterator for Iter<'a> {
-	type Item = (ParamKey<'a>, &'a common::JsonValue);
+	type Item = Entry<'a>;
 
 	fn next(&mut self) -> Option<Self::Item> {
 		match &mut self.0 {
 			IterInner::Empty => None,
-			IterInner::Map(iter) => iter.next().map(|(k, v)| (ParamKey::String(&k[..]), v)),
-			IterInner::Array(iter) => iter.next().map(|v| (ParamKey::String(""), v)),
+			IterInner::Map(iter) => iter.next().map(|(k, v)| Entry::KeyValue(ParamKey::String(&k[..]), v)),
+			IterInner::Array(iter) => iter.next().map(|v| Entry::Value(v)),
 		}
 	}