berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

rename `TryIntoHeaderPair::try_into_pair`

This commit is contained in:
Rob Ede 2021-12-13 15:41:55 +00:00
parent 22d6b8156a
commit 2537347160
No known key found for this signature in database
GPG Key ID: 97C636207D3EF933
10 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
actix-http/CHANGES.md
View File

@ -3,6 +3,7 @@
## Unreleased - 2021-xx-xx ## Unreleased - 2021-xx-xx
### Changed ### Changed
* Rename trait `IntoHeaderPair => TryIntoHeaderPair`. [#2510] * Rename trait `IntoHeaderPair => TryIntoHeaderPair`. [#2510]
* Rename `TryIntoHeaderPair::{try_into_header_pair => try_into_pair}`. [#2510]
* Rename trait `IntoHeaderValue => TryIntoHeaderValue`. [#2510] * Rename trait `IntoHeaderValue => TryIntoHeaderValue`. [#2510]
[#2510]: https://github.com/actix/actix-web/pull/2510 [#2510]: https://github.com/actix/actix-web/pull/2510

16
actix-http/src/header/into_pair.rs
View File

@ -14,7 +14,7 @@ use crate::error::HttpError;
pub trait TryIntoHeaderPair: Sized { pub trait TryIntoHeaderPair: Sized {
type Error: Into<HttpError>; type Error: Into<HttpError>;
fn try_into_header_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error>; fn try_into_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error>;
} }
#[derive(Debug)] #[derive(Debug)]
@ -39,7 +39,7 @@ where
{ {
type Error = InvalidHeaderPart; type Error = InvalidHeaderPart;
fn try_into_header_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> { fn try_into_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
let (name, value) = self; let (name, value) = self;
let value = value let value = value
.try_into_value() .try_into_value()
@ -55,7 +55,7 @@ where
{ {
type Error = InvalidHeaderPart; type Error = InvalidHeaderPart;
fn try_into_header_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> { fn try_into_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
let (name, value) = self; let (name, value) = self;
let value = value let value = value
.try_into_value() .try_into_value()
@ -71,7 +71,7 @@ where
{ {
type Error = InvalidHeaderPart; type Error = InvalidHeaderPart;
fn try_into_header_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> { fn try_into_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
let (name, value) = self; let (name, value) = self;
let name = HeaderName::try_from(name).map_err(InvalidHeaderPart::Name)?; let name = HeaderName::try_from(name).map_err(InvalidHeaderPart::Name)?;
let value = value let value = value
@ -88,7 +88,7 @@ where
{ {
type Error = InvalidHeaderPart; type Error = InvalidHeaderPart;
fn try_into_header_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> { fn try_into_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
let (name, value) = self; let (name, value) = self;
let name = HeaderName::try_from(name).map_err(InvalidHeaderPart::Name)?; let name = HeaderName::try_from(name).map_err(InvalidHeaderPart::Name)?;
let value = value let value = value
@ -106,9 +106,9 @@ where
type Error = InvalidHeaderPart; type Error = InvalidHeaderPart;
#[inline] #[inline]
fn try_into_header_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> { fn try_into_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
let (name, value) = self; let (name, value) = self;
(name.as_str(), value).try_into_header_pair() (name.as_str(), value).try_into_pair()
} }
} }
@ -116,7 +116,7 @@ impl<T: Header> TryIntoHeaderPair for T {
type Error = <T as TryIntoHeaderValue>::Error; type Error = <T as TryIntoHeaderValue>::Error;
#[inline] #[inline]
fn try_into_header_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> { fn try_into_pair(self) -> Result<(HeaderName, HeaderValue), Self::Error> {
Ok((T::name(), self.try_into_value()?)) Ok((T::name(), self.try_into_value()?))
} }
} }

4
actix-http/src/response_builder.rs
View File

@ -92,7 +92,7 @@ impl ResponseBuilder {
/// ``` /// ```
pub fn insert_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self { pub fn insert_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self {
if let Some(parts) = self.inner() { if let Some(parts) = self.inner() {
match header.try_into_header_pair() { match header.try_into_pair() {
Ok((key, value)) => { Ok((key, value)) => {
parts.headers.insert(key, value); parts.headers.insert(key, value);
} }
@ -120,7 +120,7 @@ impl ResponseBuilder {
/// ``` /// ```
pub fn append_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self { pub fn append_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self {
if let Some(parts) = self.inner() { if let Some(parts) = self.inner() {
match header.try_into_header_pair() { match header.try_into_pair() {
Ok((key, value)) => parts.headers.append(key, value), Ok((key, value)) => parts.headers.append(key, value),
Err(e) => self.err = Some(e.into()), Err(e) => self.err = Some(e.into()),
}; };

4
actix-http/src/test.rs
View File

@ -93,7 +93,7 @@ impl TestRequest {
/// Insert a header, replacing any that were set with an equivalent field name. /// Insert a header, replacing any that were set with an equivalent field name.
pub fn insert_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self { pub fn insert_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self {
match header.try_into_header_pair() { match header.try_into_pair() {
Ok((key, value)) => { Ok((key, value)) => {
parts(&mut self.0).headers.insert(key, value); parts(&mut self.0).headers.insert(key, value);
} }
@ -107,7 +107,7 @@ impl TestRequest {
/// Append a header, keeping any that were set with an equivalent field name. /// Append a header, keeping any that were set with an equivalent field name.
pub fn append_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self { pub fn append_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self {
match header.try_into_header_pair() { match header.try_into_pair() {
Ok((key, value)) => { Ok((key, value)) => {
parts(&mut self.0).headers.append(key, value); parts(&mut self.0).headers.append(key, value);
} }

2
awc/src/builder.rs
View File

@ -168,7 +168,7 @@ where
/// # Panics /// # Panics
/// Panics if header name or value is invalid. /// Panics if header name or value is invalid.
pub fn add_default_header(mut self, header: impl TryIntoHeaderPair) -> Self { pub fn add_default_header(mut self, header: impl TryIntoHeaderPair) -> Self {
match header.try_into_header_pair() { match header.try_into_pair() {
Ok((key, value)) => self.default_headers.append(key, value), Ok((key, value)) => self.default_headers.append(key, value),
Err(err) => panic!("Header error: {:?}", err.into()), Err(err) => panic!("Header error: {:?}", err.into()),
} }

6
awc/src/request.rs
View File

@ -148,7 +148,7 @@ impl ClientRequest {
/// Insert a header, replacing any that were set with an equivalent field name. /// Insert a header, replacing any that were set with an equivalent field name.
pub fn insert_header(mut self, header: impl TryIntoHeaderPair) -> Self { pub fn insert_header(mut self, header: impl TryIntoHeaderPair) -> Self {
match header.try_into_header_pair() { match header.try_into_pair() {
Ok((key, value)) => { Ok((key, value)) => {
self.head.headers.insert(key, value); self.head.headers.insert(key, value);
} }
@ -160,7 +160,7 @@ impl ClientRequest {
/// Insert a header only if it is not yet set. /// Insert a header only if it is not yet set.
pub fn insert_header_if_none(mut self, header: impl TryIntoHeaderPair) -> Self { pub fn insert_header_if_none(mut self, header: impl TryIntoHeaderPair) -> Self {
match header.try_into_header_pair() { match header.try_into_pair() {
Ok((key, value)) => { Ok((key, value)) => {
if !self.head.headers.contains_key(&key) { if !self.head.headers.contains_key(&key) {
self.head.headers.insert(key, value); self.head.headers.insert(key, value);
@ -187,7 +187,7 @@ impl ClientRequest {
/// # } /// # }
/// ``` /// ```
pub fn append_header(mut self, header: impl TryIntoHeaderPair) -> Self { pub fn append_header(mut self, header: impl TryIntoHeaderPair) -> Self {
match header.try_into_header_pair() { match header.try_into_pair() {
Ok((key, value)) => self.head.headers.append(key, value), Ok((key, value)) => self.head.headers.append(key, value),
Err(e) => self.err = Some(e.into()), Err(e) => self.err = Some(e.into()),
}; };

4
awc/src/test.rs
View File

@ -40,7 +40,7 @@ impl TestResponse {
/// Insert a header /// Insert a header
pub fn insert_header(mut self, header: impl TryIntoHeaderPair) -> Self { pub fn insert_header(mut self, header: impl TryIntoHeaderPair) -> Self {
if let Ok((key, value)) = header.try_into_header_pair() { if let Ok((key, value)) = header.try_into_pair() {
self.head.headers.insert(key, value); self.head.headers.insert(key, value);
return self; return self;
} }
@ -49,7 +49,7 @@ impl TestResponse {
/// Append a header /// Append a header
pub fn append_header(mut self, header: impl TryIntoHeaderPair) -> Self { pub fn append_header(mut self, header: impl TryIntoHeaderPair) -> Self {
if let Ok((key, value)) = header.try_into_header_pair() { if let Ok((key, value)) = header.try_into_pair() {
self.head.headers.append(key, value); self.head.headers.append(key, value);
return self; return self;
} }

2
src/middleware/default_headers.rs
View File

@ -63,7 +63,7 @@ impl DefaultHeaders {
// standard header terminology `insert` or `append` for this method would make the behavior // standard header terminology `insert` or `append` for this method would make the behavior
// of this middleware less obvious since it only adds the headers if they are not present // of this middleware less obvious since it only adds the headers if they are not present
match header.try_into_header_pair() { match header.try_into_pair() {
Ok((key, value)) => Rc::get_mut(&mut self.inner) Ok((key, value)) => Rc::get_mut(&mut self.inner)
.expect("All default headers must be added before cloning.") .expect("All default headers must be added before cloning.")
.headers .headers

4
src/response/builder.rs
View File

@ -69,7 +69,7 @@ impl HttpResponseBuilder {
/// ``` /// ```
pub fn insert_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self { pub fn insert_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self {
if let Some(parts) = self.inner() { if let Some(parts) = self.inner() {
match header.try_into_header_pair() { match header.try_into_pair() {
Ok((key, value)) => { Ok((key, value)) => {
parts.headers.insert(key, value); parts.headers.insert(key, value);
} }
@ -93,7 +93,7 @@ impl HttpResponseBuilder {
/// ``` /// ```
pub fn append_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self { pub fn append_header(&mut self, header: impl TryIntoHeaderPair) -> &mut Self {
if let Some(parts) = self.inner() { if let Some(parts) = self.inner() {
match header.try_into_header_pair() { match header.try_into_pair() {
Ok((key, value)) => parts.headers.append(key, value), Ok((key, value)) => parts.headers.append(key, value),
Err(e) => self.err = Some(e.into()), Err(e) => self.err = Some(e.into()),
}; };

4
src/response/customize_responder.rs
View File

@ -79,7 +79,7 @@ impl<R: Responder> CustomizeResponder<R> {
/// ``` /// ```
pub fn insert_header(mut self, header: impl TryIntoHeaderPair) -> Self { pub fn insert_header(mut self, header: impl TryIntoHeaderPair) -> Self {
if let Some(inner) = self.inner() { if let Some(inner) = self.inner() {
match header.try_into_header_pair() { match header.try_into_pair() {
Ok((key, value)) => { Ok((key, value)) => {
inner.override_headers.insert(key, value); inner.override_headers.insert(key, value);
} }
@ -111,7 +111,7 @@ impl<R: Responder> CustomizeResponder<R> {
/// ``` /// ```
pub fn append_header(mut self, header: impl TryIntoHeaderPair) -> Self { pub fn append_header(mut self, header: impl TryIntoHeaderPair) -> Self {
if let Some(inner) = self.inner() { if let Some(inner) = self.inner() {
match header.try_into_header_pair() { match header.try_into_pair() {
Ok((key, value)) => { Ok((key, value)) => {
inner.append_headers.append(key, value); inner.append_headers.append(key, value);
} }