use to_raw_value from serde_json (#64)

crates/json-rpc/src/packet.rs

@@ -50,9 +50,7 @@ impl RequestPacket {
     pub fn serialize(self) -> serde_json::Result<Box<RawValue>> {
         match self {
             RequestPacket::Single(single) => Ok(single.take_request()),
-            RequestPacket::Batch(batch) => {
-                serde_json::to_string(&batch).and_then(RawValue::from_string)
-            }
+            RequestPacket::Batch(batch) => serde_json::value::to_raw_value(&batch),
         }
     }
 

crates/json-rpc/src/request.rs

@@ -49,16 +49,13 @@ where
     ///
     /// If serialization of the params fails.
     pub fn box_params(self) -> PartiallySerializedRequest {
-        Request {
-            meta: self.meta,
-            params: RawValue::from_string(serde_json::to_string(&self.params).unwrap()).unwrap(),
-        }
+        Request { meta: self.meta, params: serde_json::value::to_raw_value(&self.params).unwrap() }
     }
 
     /// Serialize the request, including the request parameters.
     pub fn serialize(self) -> serde_json::Result<SerializedRequest> {
-        let request = serde_json::to_string(&self)?;
-        Ok(SerializedRequest { meta: self.meta, request: RawValue::from_string(request)? })
+        let request = serde_json::value::to_raw_value(&self)?;
+        Ok(SerializedRequest { meta: self.meta, request })
     }
 }
 

crates/transport/src/utils.rs

@@ -1,5 +1,8 @@
 use serde::Serialize;
-use serde_json::{self, value::RawValue};
+use serde_json::{
+    self,
+    value::{to_raw_value, RawValue},
+};
 use std::future::Future;
 use url::Url;
 
@@ -11,8 +14,7 @@ pub fn to_json_raw_value<S>(s: &S) -> TransportResult<Box<RawValue>>
 where
     S: Serialize,
 {
-    RawValue::from_string(serde_json::to_string(s).map_err(TransportError::ser_err)?)
-        .map_err(TransportError::ser_err)
+    to_raw_value(s).map_err(TransportError::ser_err)
 }
 
 /// Guess whether the URL is local, based on the hostname.