Merge #428 and #499

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
           - nightly
           # When updating this value, don't forget to also adjust the
           # `rust-version` field in the `Cargo.toml` file.
-          - 1.46.0
+          - 1.49.0
 
         include:
           - rust: nightly

Cargo.toml

@@ -21,7 +21,7 @@ keywords = ["http"]
 categories = ["web-programming"]
 edition = "2018"
 # When updating this value, don't forget to also adjust the GitHub Actions config.
-rust-version = "1.46.0"
+rust-version = "1.49.0"
 
 [dependencies]
 bytes = "1"
@@ -36,6 +36,7 @@ seahash = "3.0.5"
 serde = "1.0"
 serde_json = "1.0"
 doc-comment = "0.3"
+criterion = "0.3.2"
 
 [[bench]]
 name = "header_map"
@@ -45,6 +46,11 @@ path = "benches/header_map/mod.rs"
 name = "header_name"
 path = "benches/header_name.rs"
 
+[[bench]]
+name = "header_name2"
+path = "benches/header_name2.rs"
+harness = false
+
 [[bench]]
 name = "header_value"
 path = "benches/header_value.rs"

benches/header_name.rs

@@ -130,6 +130,128 @@ fn make_all_known_headers() -> Vec<Vec<u8>> {
     ]
 }
 
+static ALL_KNOWN_HEADERS: &[&str] = &[
+    // Standard request headers
+    "a-im",
+    "accept",
+    "accept-charset",
+    "accept-datetime",
+    "accept-encoding",
+    "accept-language",
+    "access-control-request-method",
+    "authorization",
+    "cache-control",
+    "connection",
+    "permanent",
+    "content-length",
+    "content-md5",
+    "content-type",
+    "cookie",
+    "date",
+    "expect",
+    "forwarded",
+    "from",
+    "host",
+    "permanent",
+    "http2-settings",
+    "if-match",
+    "if-modified-since",
+    "if-none-match",
+    "if-range",
+    "if-unmodified-since",
+    "max-forwards",
+    "origin",
+    "pragma",
+    "proxy-authorization",
+    "range",
+    "referer",
+    "te",
+    "user-agent",
+    "upgrade",
+    "via",
+    "warning",
+    // common_non_standard
+    "upgrade-insecure-requests",
+    "upgrade-insecure-requests",
+    "x-requested-with",
+    "dnt",
+    "x-forwarded-for",
+    "x-forwarded-host",
+    "x-forwarded-proto",
+    "front-end-https",
+    "x-http-method-override",
+    "x-att-deviceid",
+    "x-wap-profile",
+    "proxy-connection",
+    "x-uidh",
+    "x-csrf-token",
+    "x-request-id",
+    "x-correlation-id",
+    "save-data",
+    // standard_response_headers
+    "accept-patch",
+    "accept-ranges",
+    "access-control-allow-credentials",
+    "access-control-allow-headers",
+    "access-control-allow-methods",
+    "access-control-allow-origin",
+    "access-control-expose-headers",
+    "access-control-max-age",
+    "age",
+    "allow",
+    "alt-svc",
+    "cache-control",
+    "connection",
+    "content-disposition",
+    "content-encoding",
+    "content-language",
+    "content-length",
+    "content-location",
+    "content-md5",
+    "content-range",
+    "content-type",
+    "date",
+    "delta-base",
+    "etag",
+    "expires",
+    "im",
+    "last-modified",
+    "link",
+    "location",
+    "p3p",
+    "permanent",
+    "pragma",
+    "proxy-authenticate",
+    "public-key-pins",
+    "retry-after",
+    "server",
+    "set-cookie",
+    "strict-transport-security",
+    "tk",
+    "trailer",
+    "transfer-encoding",
+    "upgrade",
+    "vary",
+    "via",
+    "warning",
+    "www-authenticate",
+    "x-frame-options",
+    // common_non_standard_response
+    "content-security-policy",
+    "refresh",
+    "status",
+    "timing-allow-origin",
+    "x-content-duration",
+    "x-content-security-policy",
+    "x-content-type-options",
+    "x-correlation-id",
+    "x-powered-by",
+    "x-request-id",
+    "x-ua-compatible",
+    "x-webkit-csp",
+    "x-xss-protection",
+];
+
 #[bench]
 fn header_name_easy(b: &mut Bencher) {
     let name = b"Content-type";
@@ -138,6 +260,14 @@ fn header_name_easy(b: &mut Bencher) {
     });
 }
 
+#[bench]
+fn header_name_custom(b: &mut Bencher) {
+    let name = b"Foo-Bar-Baz-Blah";
+    b.iter(|| {
+        HeaderName::from_bytes(&name[..]).unwrap();
+    });
+}
+
 #[bench]
 fn header_name_bad(b: &mut Bencher) {
     let name = b"bad header name";
@@ -155,3 +285,12 @@ fn header_name_various(b: &mut Bencher) {
         }
     });
 }
+
+#[bench]
+fn header_name_from_static(b: &mut Bencher) {
+    b.iter(|| {
+        for name in ALL_KNOWN_HEADERS {
+            HeaderName::from_static(name);
+        }
+    });
+}

benches/header_name2.rs

@@ -0,0 +1,52 @@
+use criterion::{criterion_group, criterion_main, BenchmarkId,Criterion, Throughput};
+use http::header::HeaderName;
+
+// This is a list of some of the standard headers ordered by increasing size.
+// It has exactly one standard header per size (some sizes don't have a standard
+// header).
+const STANDARD_HEADERS_BY_SIZE: &[&str] = &[
+    "te",
+    "age",
+    "date",
+    "allow",
+    "accept",
+    "alt-svc",
+    "if-match",
+    "forwarded",
+    "connection",
+    "retry-after",
+    "content-type",
+    "accept-ranges",
+    "accept-charset",
+    "accept-encoding",
+    "content-encoding",
+    "if-modified-since",
+    "proxy-authenticate",
+    "content-disposition",
+    "sec-websocket-accept",
+    "sec-websocket-version",
+    "access-control-max-age",
+    "content-security-policy",
+    "sec-websocket-extensions",
+    "strict-transport-security",
+    "access-control-allow-origin",
+    "access-control-allow-headers",
+    "access-control-expose-headers",
+    "access-control-request-headers",
+    "access-control-allow-credentials",
+    "content-security-policy-report-only",
+];
+
+fn header_name_by_size(c: &mut Criterion) {
+    let mut group = c.benchmark_group("std_hdr");
+    for name in STANDARD_HEADERS_BY_SIZE {
+        group.throughput(Throughput::Bytes(name.len() as u64));
+        group.bench_with_input(BenchmarkId::from_parameter(name), name, |b, name| {
+            b.iter(|| HeaderName::from_static(name) );
+        });
+    }
+    group.finish();
+}
+
+criterion_group!(benches, header_name_by_size);
+criterion_main!(benches);

src/byte_str.rs

@@ -18,7 +18,7 @@ impl ByteStr {
     }
 
     #[inline]
-    pub fn from_static(val: &'static str) -> ByteStr {
+    pub const fn from_static(val: &'static str) -> ByteStr {
         ByteStr {
             // Invariant: val is a str so contains vaid UTF-8.
             bytes: Bytes::from_static(val.as_bytes()),