diff options
author | Paul Woolcock <paul@woolcock.us> | 2018-09-20 09:05:52 -0400 |
---|---|---|
committer | Paul Woolcock <paul@woolcock.us> | 2018-09-20 11:23:43 -0400 |
commit | 2d8958e0d90cb1206df6d28eab8b4294602184e3 (patch) | |
tree | de07c371ab922c2dc9e23ca5617ca8add688291d /src/page.rs | |
parent | 7f0d57038f899692c73b9e14bb8caf62b5bfe3e4 (diff) |
Update code to be compatible with reqwest 0.9
Diffstat (limited to 'src/page.rs')
-rw-r--r-- | src/page.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/page.rs b/src/page.rs index 32ba048..cab4e09 100644 --- a/src/page.rs +++ b/src/page.rs @@ -1,9 +1,7 @@ use super::{deserialise, Mastodon, Result}; use entities::itemsiter::ItemsIter; -use reqwest::{ - header::{Link, RelationType}, - Response, -}; +use hyper_old_types::header::{parsing, Link, RelationType}; +use reqwest::{header::LINK, Response}; use serde::Deserialize; use url::Url; @@ -32,7 +30,7 @@ macro_rules! pages { }; let response = self.mastodon.send( - &mut self.mastodon.client.get(url) + self.mastodon.client.get(url) )?; let (prev, next) = get_links(&response)?; @@ -108,7 +106,10 @@ fn get_links(response: &Response) -> Result<(Option<Url>, Option<Url>)> { let mut prev = None; let mut next = None; - if let Some(link_header) = response.headers().get::<Link>() { + if let Some(link_header) = response.headers().get(LINK) { + let link_header = link_header.to_str().unwrap(); + let link_header = link_header.as_bytes(); + let link_header: Link = parsing::from_raw_str(&link_header).unwrap(); for value in link_header.values() { if let Some(relations) = value.rel() { if relations.contains(&RelationType::Next) { |