Skip to content
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.

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

Add Method::from_static #595

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
71 changes: 71 additions & 0 deletions src/method.rs
Expand Up @@ -134,6 +134,29 @@ impl Method {
}
}

/// Convert static bytes into a `Method`.
///
/// # Panics
///
/// If the input bytes are not a valid method name or if the method name is over 15 bytes.
pub const fn from_static(src: &'static [u8]) -> Method {
match src {
b"OPTIONS" => Method::OPTIONS,
b"GET" => Method::GET,
b"POST" => Method::POST,
b"PUT" => Method::PUT,
b"DELETE" => Method::DELETE,
b"HEAD" => Method::HEAD,
b"TRACE" => Method::TRACE,
b"CONNECT" => Method::CONNECT,
b"PATCH" => Method::PATCH,
_ => {
let inline = InlineExtension::from_static(src);
Method(ExtensionInline(inline))
}
}
}

fn extension_inline(src: &[u8]) -> Result<Method, InvalidMethod> {
let inline = InlineExtension::new(src)?;

Expand Down Expand Up @@ -330,6 +353,34 @@ mod extension {
Ok(InlineExtension(data, src.len() as u8))
}

/// Convert static bytes into an `InlineExtension`.
///
/// # Panics
///
/// If the input bytes are not a valid method name or if the method name is over 15 bytes.
pub const fn from_static(src: &'static [u8]) -> InlineExtension {
let mut i = 0;
let mut dst = [0u8;15];
WhyNotHugo marked this conversation as resolved.
Show resolved Hide resolved
if src.len() > 15 {
// panicking in const requires Rust 1.57.0
#[allow(unconditional_panic)]
([] as [u8; 0])[0];
}
while i < src.len() {
let byte = src[i] ;
let v = METHOD_CHARS[byte as usize];
if v == 0 {
// panicking in const requires Rust 1.57.0
#[allow(unconditional_panic)]
([] as [u8; 0])[0];
}
dst[i] = byte;
i += 1;
}

InlineExtension(dst, i as u8)
}

pub fn as_str(&self) -> &str {
let InlineExtension(ref data, len) = self;
// Safety: the invariant of InlineExtension ensures that the first
Expand Down Expand Up @@ -436,6 +487,26 @@ mod test {
assert_eq!(Method::GET, &Method::GET);
}

#[test]
fn test_from_static() {
seanmonstar marked this conversation as resolved.
Show resolved Hide resolved
assert_eq!(Method::from_static(b"PROPFIND"), Method::from_bytes(b"PROPFIND").unwrap());
assert_eq!(Method::from_static(b"GET"), Method::from_bytes(b"GET").unwrap());
seanmonstar marked this conversation as resolved.
Show resolved Hide resolved
assert_eq!(Method::from_static(b"GET"), Method::GET);
assert_eq!(Method::from_static(b"123456789012345").to_string(), "123456789012345".to_string());
}

#[test]
#[should_panic]
fn test_from_static_too_long() {
Method::from_static(b"1234567890123456");
}

#[test]
#[should_panic]
fn test_from_static_bad() {
Method::from_static(b"\0");
}

#[test]
fn test_invalid_method() {
assert!(Method::from_str("").is_err());
Expand Down