From 599b677f5a88094f3eb242f0327790ecd09a824c Mon Sep 17 00:00:00 2001 From: philipp Date: Sun, 20 Sep 2020 11:59:01 +0200 Subject: [PATCH 1/5] Avoid temporary variable `fin` --- src/protocol/message.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/protocol/message.rs b/src/protocol/message.rs index 5df4ba0..7019494 100644 --- a/src/protocol/message.rs +++ b/src/protocol/message.rs @@ -37,20 +37,16 @@ mod string_collect { let mut input: &[u8] = tail.as_ref(); if let Some(mut incomplete) = self.incomplete.take() { - let fin = if let Some((result, rest)) = incomplete.try_complete(input) { + if let Some((result, rest)) = incomplete.try_complete(input) { input = rest; if let Ok(text) = result { self.data.push_str(text); } else { return Err(Error::Utf8); } - true } else { input = &[]; - false - }; - if !fin { - self.incomplete = Some(incomplete) + self.incomplete = Some(incomplete); } } From 4cdc2edab1eb6ed551a762e8aea63ff3e868ecfd Mon Sep 17 00:00:00 2001 From: philipp Date: Sun, 20 Sep 2020 16:23:02 +0200 Subject: [PATCH 2/5] Delegate into_client_request --- src/client.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/client.rs b/src/client.rs index d9d7151..e68a546 100644 --- a/src/client.rs +++ b/src/client.rs @@ -206,17 +206,13 @@ impl<'a> IntoClientRequest for &'a str { impl<'a> IntoClientRequest for &'a String { fn into_client_request(self) -> Result { - let uri: Uri = self.parse()?; - - Ok(Request::get(uri).body(())?) + <&str as IntoClientRequest>::into_client_request(self) } } impl IntoClientRequest for String { fn into_client_request(self) -> Result { - let uri: Uri = self.parse()?; - - Ok(Request::get(uri).body(())?) + <&str as IntoClientRequest>::into_client_request(&self) } } From 90345c994a25d9b181e9aca7dacad0ad311ff999 Mon Sep 17 00:00:00 2001 From: philipp Date: Sun, 20 Sep 2020 16:23:02 +0200 Subject: [PATCH 3/5] Delegate into_client_request (2) --- src/client.rs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/client.rs b/src/client.rs index e68a546..8168d2e 100644 --- a/src/client.rs +++ b/src/client.rs @@ -230,17 +230,13 @@ impl IntoClientRequest for Uri { impl<'a> IntoClientRequest for &'a Url { fn into_client_request(self) -> Result { - let uri: Uri = self.as_str().parse()?; - - Ok(Request::get(uri).body(())?) + self.as_str().into_client_request() } } impl IntoClientRequest for Url { fn into_client_request(self) -> Result { - let uri: Uri = self.as_str().parse()?; - - Ok(Request::get(uri).body(())?) + self.as_str().into_client_request() } } From 064fd9313f16b5f1195d4d22ad2520e54c73c372 Mon Sep 17 00:00:00 2001 From: philipp Date: Sun, 20 Sep 2020 16:23:02 +0200 Subject: [PATCH 4/5] Delegate into_client_request (3) --- src/client.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client.rs b/src/client.rs index 8168d2e..be59b40 100644 --- a/src/client.rs +++ b/src/client.rs @@ -218,7 +218,7 @@ impl IntoClientRequest for String { impl<'a> IntoClientRequest for &'a Uri { fn into_client_request(self) -> Result { - Ok(Request::get(self.clone()).body(())?) + self.clone().into_client_request() } } From 50bc1b5e903377272a7277cefcc599b0a76e5d04 Mon Sep 17 00:00:00 2001 From: philipp Date: Sun, 20 Sep 2020 16:23:02 +0200 Subject: [PATCH 5/5] Delegate into_client_request (4) --- src/client.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/client.rs b/src/client.rs index be59b40..cba6109 100644 --- a/src/client.rs +++ b/src/client.rs @@ -198,9 +198,7 @@ pub trait IntoClientRequest { impl<'a> IntoClientRequest for &'a str { fn into_client_request(self) -> Result { - let uri: Uri = self.parse()?; - - Ok(Request::get(uri).body(())?) + self.parse::()?.into_client_request() } }