toxblh/podcasts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Source: change the signature of the request constructor

Browse Source 
We don't really need to return Self.
This commit is contained in:
Jordan Petridis 2018-04-15 02:39:24 +03:00
parent 08ebb9e7d6
commit 59c634f626
No known key found for this signature in database
GPG Key ID: CEABAD9F5683B9A6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hammond-data/src/models/source.rs
View File

@ -116,7 +116,7 @@ impl Source {
// 408: Timeout // 408: Timeout
// 410: Feed deleted // 410: Feed deleted
// TODO: Rething this api, // TODO: Rething this api,
fn match_status(mut self, res: Response) -> Result<(Self, Response), DataError> { fn match_status(mut self, res: Response) -> Result<Response, DataError> {
self.update_etag(&res)?; self.update_etag(&res)?;
let code = res.status(); let code = res.status();
@ -136,7 +136,7 @@ impl Source {
StatusCode::Gone => return Err(self.make_err("410: Feed was deleted..", code)), StatusCode::Gone => return Err(self.make_err("410: Feed was deleted..", code)),
_ => info!("HTTP StatusCode: {}", code), _ => info!("HTTP StatusCode: {}", code),
}; };
Ok((self, res)) Ok(res)
} }
fn handle_301(&mut self, res: &Response) -> Result<(), DataError> { fn handle_301(&mut self, res: &Response) -> Result<(), DataError> {
@ -180,7 +180,7 @@ impl Source {
source source
.request_constructor(client.clone(), ignore_etags) .request_constructor(client.clone(), ignore_etags)
.then(|res| match res { .then(|res| match res {
Ok(s) => Ok(Loop::Break(s)), Ok(response) => Ok(Loop::Break(response)),
Err(err) => match err { Err(err) => match err {
DataError::F301(s) => { DataError::F301(s) => {
info!("Following redirect..."); info!("Following redirect...");
@ -192,7 +192,7 @@ impl Source {
}); });
let feed = response let feed = response
.and_then(|(_, res)| response_to_channel(res)) .and_then(|res| response_to_channel(res))
.and_then(move |chan| { .and_then(move |chan| {
FeedBuilder::default() FeedBuilder::default()
.channel(chan) .channel(chan)
@ -210,7 +210,7 @@ impl Source {
self, self,
client: Client<HttpsConnector<HttpConnector>>, client: Client<HttpsConnector<HttpConnector>>,
ignore_etags: bool, ignore_etags: bool,
) -> Box<Future<Item = (Self, Response), Error = DataError>> { ) -> Box<Future<Item = Response, Error = DataError>> {
// FIXME: remove unwrap somehow // FIXME: remove unwrap somehow
let uri = Uri::from_str(self.uri()).unwrap(); let uri = Uri::from_str(self.uri()).unwrap();
let mut req = Request::new(Method::Get, uri); let mut req = Request::new(Method::Get, uri);