lib/ureq
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(json): bump serde_json dependency and fix failing test

Browse Source
This commit is contained in:
Harsh Shandilya
2023-06-16 18:40:01 +05:30
committed by Martin Algesten
parent ed2dd3ade4
commit 406b41a264
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@@ -33,7 +33,7 @@ once_cell = "1"
url = "2" url = "2"
socks = { version = "0.3", optional = true } socks = { version = "0.3", optional = true }
serde = { version = "1", optional = true } serde = { version = "1", optional = true }
serde_json = { version = ">=1,<1.0.94", optional = true } serde_json = { version = ">=1.0.97", optional = true }
encoding_rs = { version = "0.8", optional = true } encoding_rs = { version = "0.8", optional = true }
cookie_store = { version = "0.19", optional = true, default-features = false, features = ["preserve_order"] } cookie_store = { version = "0.19", optional = true, default-features = false, features = ["preserve_order"] }
log = "0.4" log = "0.4"

9
src/response.rs
View File

@@ -533,16 +533,13 @@ impl Response {
#[cfg(feature = "json")] #[cfg(feature = "json")]
pub fn into_json<T: DeserializeOwned>(self) -> io::Result<T> { pub fn into_json<T: DeserializeOwned>(self) -> io::Result<T> {
use crate::stream::io_err_timeout; use crate::stream::io_err_timeout;
use std::error::Error;
let reader = self.into_reader(); let reader = self.into_reader();
serde_json::from_reader(reader).map_err(|e| { serde_json::from_reader(reader).map_err(|e| {
// This is to unify TimedOut io::Error in the API. // This is to unify TimedOut io::Error in the API.
// We make a clone of the original error since serde_json::Error doesn't if let Some(kind) = e.io_error_kind() {
// let us get the wrapped error instance back. if kind == io::ErrorKind::TimedOut {
if let Some(ioe) = e.source().and_then(|s| s.downcast_ref::<io::Error>()) { return io_err_timeout(e.to_string());
if ioe.kind() == io::ErrorKind::TimedOut {
return io_err_timeout(ioe.to_string());
} }
} }