Merge branch 'master' into try-from-bytes

Author: tesaguri

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: seanmonstar

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
@@ -55,7 +55,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install Rust (${{ matrix.rust }})
         uses: dtolnay/rust-toolchain@master
@@ -74,7 +74,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
+
+      - uses: dtolnay/rust-toolchain@stable
+
+      - uses: taiki-e/install-action@cargo-hack
+
+      - name: Remove dev-dependencies
+        run: cargo hack --remove-dev-deps update
+
+      - name: Pin deps
+        run: cargo update -p itoa --precise 1.0.15
 
       - name: Get MSRV from package metadata
         id: metadata
@@ -96,7 +106,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@stable
@@ -109,7 +119,7 @@ jobs:
   minimal-versions:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: dtolnay/rust-toolchain@nightly
       - uses: dtolnay/rust-toolchain@stable
       - uses: taiki-e/install-action@cargo-hack
@@ -122,7 +132,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       - name: Install Rust
         uses: dtolnay/rust-toolchain@nightly
@@ -136,7 +146,7 @@ jobs:
     name: semver
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Check semver
         uses: obi1kenobi/cargo-semver-checks-action@v2
         with:

CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.4.0 (November 24, 2025)
+
+- Add `StatusCode::EARLY_HINTS` constant for 103 Early Hints.
+- Make `StatusCode::from_u16` now a `const fn`.
+- Make `Authority::from_static` now a `const fn`.
+- Make `PathAndQuery::from_static` now a `const fn`.
+- MSRV increased to 1.57 (allows legible const fn panic messages).
+
 # 1.3.1 (March 11, 2025)
 
 * Fix validation that all characters are UTF-8 in URI path and query.

Cargo.toml

@@ -4,7 +4,7 @@ name = "http"
 # - Update html_root_url in lib.rs.
 # - Update CHANGELOG.md.
 # - Create git tag
-version = "1.3.1"
+version = "1.4.0"
 readme = "README.md"
 documentation = "https://docs.rs/http"
 repository = "https://github.com/hyperium/http"
@@ -19,9 +19,8 @@ A set of types for representing HTTP requests and responses.
 """
 keywords = ["http"]
 categories = ["web-programming"]
-edition = "2018"
-# When updating this value, don't forget to also adjust the GitHub Actions config.
-rust-version = "1.49.0"
+edition = "2021"
+rust-version = "1.57.0"
 
 [workspace]
 members = [
@@ -38,12 +37,11 @@ std = []
 
 [dependencies]
 bytes = "1"
-fnv = "1.0.5"
 itoa = "1"
 
 [dev-dependencies]
 quickcheck = "1"
-rand = "0.9.1"
+rand = "0.10"
 serde = "1.0"
 serde_json = "1.0"
 doc-comment = "0.3"

README.md

@@ -62,9 +62,9 @@ fn main() {
 
 # Supported Rust Versions
 
-This project follows the [Tokio MSRV][msrv] and is currently set to `1.49`.
+This project follows the [hyper's MSRV _policy_][msrv], though it can be lower, and is currently set to `1.57`.
 
-[msrv]: https://github.com/tokio-rs/tokio/#supported-rust-versions
+[msrv]: https://hyper.rs/contrib/msrv/
 
 # License
 

src/byte_str.rs

@@ -74,9 +74,9 @@ impl From<String> for ByteStr {
     }
 }
 
-impl<'a> From<&'a str> for ByteStr {
+impl From<&str> for ByteStr {
     #[inline]
-    fn from(src: &'a str) -> ByteStr {
+    fn from(src: &str) -> ByteStr {
         ByteStr {
             // Invariant: src is a str so contains valid UTF-8.
             bytes: Bytes::copy_from_slice(src.as_bytes()),

src/extensions.rs

@@ -1,4 +1,4 @@
-use std::any::{Any, TypeId};
+use std::any::{type_name, Any, TypeId};
 use std::collections::HashMap;
 use std::fmt;
 use std::hash::{BuildHasherDefault, Hasher};
@@ -267,7 +267,21 @@ impl Extensions {
 
 impl fmt::Debug for Extensions {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        f.debug_struct("Extensions").finish()
+        struct TypeName(&'static str);
+        impl fmt::Debug for TypeName {
+            fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+                f.write_str(self.0)
+            }
+        }
+
+        let mut set = f.debug_set();
+        if let Some(map) = &self.map {
+            set.entries(
+                map.values()
+                    .map(|any_clone| TypeName(any_clone.as_ref().type_name())),
+            );
+        }
+        set.finish()
     }
 }
 
@@ -276,6 +290,7 @@ trait AnyClone: Any {
     fn as_any(&self) -> &dyn Any;
     fn as_any_mut(&mut self) -> &mut dyn Any;
     fn into_any(self: Box<Self>) -> Box<dyn Any>;
+    fn type_name(&self) -> &'static str;
 }
 
 impl<T: Clone + Send + Sync + 'static> AnyClone for T {
@@ -294,6 +309,10 @@ impl<T: Clone + Send + Sync + 'static> AnyClone for T {
     fn into_any(self: Box<Self>) -> Box<dyn Any> {
         self
     }
+
+    fn type_name(&self) -> &'static str {
+        type_name::<T>()
+    }
 }
 
 impl Clone for Box<dyn AnyClone + Send + Sync> {
@@ -308,13 +327,23 @@ fn test_extensions() {
     struct MyType(i32);
 
     let mut extensions = Extensions::new();
+    assert_eq!(format!("{extensions:?}"), "{}");
 
     extensions.insert(5i32);
     extensions.insert(MyType(10));
 
     assert_eq!(extensions.get(), Some(&5i32));
     assert_eq!(extensions.get_mut(), Some(&mut 5i32));
 
+    let dbg = format!("{extensions:?}");
+    // map order is NOT deterministic
+    assert!(
+        (dbg == "{http::extensions::test_extensions::MyType, i32}")
+            || (dbg == "{i32, http::extensions::test_extensions::MyType}"),
+        "{}",
+        dbg
+    );
+
     let ext2 = extensions.clone();
 
     assert_eq!(extensions.remove::<i32>(), Some(5i32));