From fc73dfcdb3bb06b484741c68e7ed5fe79c8b5dc7 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 22 Feb 2024 12:46:47 +0100 Subject: [PATCH 1/2] Update Cargo.toml --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index cbb4bafd..50098342 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,7 @@ readme = "README.md" keywords = ["http", "async", "non-blocking"] categories = ["asynchronous", "web-programming", "network-programming"] exclude = ["fixtures/**", "ci/**"] -edition = "2018" +edition = "2021" rust-version = "1.63" [features] From e78aa8419bbc685cb206c56b3b3da4e6bf810d68 Mon Sep 17 00:00:00 2001 From: smndtrl Date: Thu, 22 Feb 2024 15:52:06 +0100 Subject: [PATCH 2/2] handle `TryFrom` duplicate --- examples/akamai.rs | 1 - src/frame/headers.rs | 2 -- 2 files changed, 3 deletions(-) diff --git a/examples/akamai.rs b/examples/akamai.rs index 788bf300..8d87b778 100644 --- a/examples/akamai.rs +++ b/examples/akamai.rs @@ -5,7 +5,6 @@ use tokio_rustls::TlsConnector; use tokio_rustls::rustls::{OwnedTrustAnchor, RootCertStore, ServerName}; -use std::convert::TryFrom; use std::error::Error; use std::net::ToSocketAddrs; diff --git a/src/frame/headers.rs b/src/frame/headers.rs index 1e6bc9b7..7f4ab847 100644 --- a/src/frame/headers.rs +++ b/src/frame/headers.rs @@ -972,8 +972,6 @@ fn decoded_header_size(name: usize, value: usize) -> usize { #[cfg(test)] mod test { - use std::iter::FromIterator; - use super::*; use crate::frame; use crate::hpack::{huffman, Encoder};