Skip to content

Commit 6092d2c

Browse files
committed
Second Set Changes Done
1 parent 2831c60 commit 6092d2c

File tree

4 files changed

+8
-9
lines changed

4 files changed

+8
-9
lines changed

src/client.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -83,22 +83,22 @@ impl<Http: HttpClient> Client<Http> {
8383
let raw_indexes = value["results"]
8484
.as_array()
8585
.ok_or_else(|| serde_json::Error::custom("Missing or invalid 'results' field"))
86-
.map_err(Error::SerdeParseError)?;
86+
.map_err(Error::ParseError)?;
8787

8888
let limit = value["limit"]
8989
.as_u64()
9090
.ok_or_else(|| serde_json::Error::custom("Missing or invalid 'limit' field"))
91-
.map_err(Error::SerdeParseError)? as u32;
91+
.map_err(Error::ParseError)? as u32;
9292

9393
let offset = value["offset"]
9494
.as_u64()
9595
.ok_or_else(|| serde_json::Error::custom("Missing or invalid 'offset' field"))
96-
.map_err(Error::SerdeParseError)? as u32;
96+
.map_err(Error::ParseError)? as u32;
9797

9898
let total = value["total"]
9999
.as_u64()
100100
.ok_or_else(|| serde_json::Error::custom("Missing or invalid 'total' field"))
101-
.map_err(Error::SerdeParseError)? as u32;
101+
.map_err(Error::ParseError)? as u32;
102102

103103
let results = raw_indexes
104104
.iter()

src/errors.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ mod test {
386386
"age": 43,
387387
}"#;
388388

389-
let error = Error::SerdeParseError(serde_json::from_str::<String>(data).unwrap_err());
389+
let error = Error::ParseError(serde_json::from_str::<String>(data).unwrap_err());
390390
assert_eq!(
391391
error.to_string(),
392392
"Error parsing response JSON: invalid type: map, expected a string at line 2 column 8"

src/indexes.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,7 @@ impl<Http: HttpClient> Index<Http> {
102102
primaryKey: Option<String>,
103103
}
104104

105-
let i: IndexFromSerde =
106-
serde_json::from_value(raw_index).map_err(Error::SerdeParseError)?;
105+
let i: IndexFromSerde = serde_json::from_value(raw_index).map_err(Error::ParseError)?;
107106

108107
Ok(Index {
109108
uid: i.uid,

src/request.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ pub fn parse_response<Output: DeserializeOwned>(
117117
}
118118
Err(e) => {
119119
error!("Request succeeded but failed to parse response");
120-
Err(Error::SerdeParseError(e))
120+
Err(Error::ParseError(e))
121121
}
122122
};
123123
}
@@ -139,7 +139,7 @@ pub fn parse_response<Output: DeserializeOwned>(
139139
},
140140
));
141141
}
142-
Err(Error::SerdeParseError(e))
142+
Err(Error::ParseError(e))
143143
}
144144
}
145145
}

0 commit comments

Comments
 (0)