Skip to content

Implement Display for Referer #122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 3, 2024
Merged

Implement Display for Referer #122

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions src/common/referer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::fmt;
use std::str::FromStr;

use http::header::HeaderValue;
use util::HeaderValueString;

/// `Referer` header, defined in
/// [RFC7231](http://tools.ietf.org/html/rfc7231#section-5.5.2)
Expand Down Expand Up @@ -30,7 +31,7 @@ use http::header::HeaderValue;
/// let r = Referer::from_static("/People.html#tim");
/// ```
#[derive(Debug, Clone, PartialEq)]
pub struct Referer(HeaderValue);
pub struct Referer(HeaderValueString);

derive_header! {
Referer(_),
Expand All @@ -44,7 +45,7 @@ impl Referer {
///
/// Panics if the string is not a legal header value.
pub fn from_static(s: &'static str) -> Referer {
Referer(HeaderValue::from_static(s))
Referer(HeaderValueString::from_static(s))
}
}

Expand All @@ -53,8 +54,14 @@ error_type!(InvalidReferer);
impl FromStr for Referer {
type Err = InvalidReferer;
fn from_str(src: &str) -> Result<Self, Self::Err> {
HeaderValue::from_str(src)
HeaderValueString::from_str(src)
.map(Referer)
.map_err(|_| InvalidReferer { _inner: () })
}
}

impl fmt::Display for Referer {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt::Display::fmt(&self.0, f)
}
}