Skip to content

Commit

Permalink
Merge pull request #7 from Pelkhier/master
Browse files Browse the repository at this point in the history
fix: updating dependencies and changes required
  • Loading branch information
DukeFerdinand authored Dec 10, 2023
2 parents 5e3f605 + 6880265 commit ad41970
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ readme = "README.md"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
reqwest = "0.9.22"
serde = "1.0.102"
serde_json = "1.0.41"
reqwest = { version = "0.11", features = ["blocking", "json"] }
serde = "1.0.193"
serde_json = "1.0.108"
8 changes: 5 additions & 3 deletions src/helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,10 @@ use serde_json::Value;
///
/// ### Convenience function for getting JSON from return string via `serde`
pub fn get_json(mut reqwest_res: reqwest::Response) -> Result<Value, Box<dyn std::error::Error>> {
let data: Value = serde_json::from_str(&reqwest_res.text()?)?;
pub fn get_json(
reqwest_res: reqwest::blocking::Response,
) -> Result<Value, Box<dyn std::error::Error>> {
let data: Value = serde_json::from_str(&reqwest_res.text()?)?;

Ok(data)
Ok(data)
}
8 changes: 4 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ extern crate serde_json;

pub mod helpers;

use reqwest::blocking::Client;
use reqwest::header::{HeaderMap, HeaderValue};
use reqwest::Client;
use serde_json::Value;

#[derive(Debug, Clone)]
Expand Down Expand Up @@ -90,8 +90,8 @@ pub struct Query {
impl Query {
pub fn execute(&self) -> Result<Value, Box<dyn std::error::Error>> {
let url = format!("{}?query={}", self.base_url, self.query.as_ref().unwrap());
let mut res: _ = reqwest::get(&url)?;
let data: Value = serde_json::from_str(&res.text()?)?;
let mut res: _ = reqwest::blocking::get(&url)?.text()?;
let data: Value = serde_json::from_str(&res)?;

Ok(data)
}
Expand Down Expand Up @@ -133,7 +133,7 @@ impl SanityConfig {
/// }
/// }
/// ```
pub fn get(&mut self, query: &str) -> Result<reqwest::Response, reqwest::Error> {
pub fn get(&mut self, query: &str) -> Result<reqwest::blocking::Response, reqwest::Error> {
let client = Client::new();
let url = self.build_url(Some(query));
let res = client.get(&url).bearer_auth(&self.access_token).send();
Expand Down

0 comments on commit ad41970

Please sign in to comment.