Merge pull request #339 from hatoo/update-deps

Update deps

Cargo.toml

@@ -37,16 +37,11 @@ serde = { version = "1.0.142", features = ["derive"] }
 serde_json = "1.0"
 thiserror = "1.0.16"
 tokio = { version = "1.14.0", features = ["full"] }
-ratatui = { version = "0.23", default-features = false, features = [
+ratatui = { version = "0.24.0", default-features = false, features = [
     "crossterm",
 ] }
 
-http = "0.2"
-hyper = { git = "https://github.com/hyperium/hyper.git", features = [
-    "client",
-    "http1",
-    "http2",
-] }
+hyper = { version = "1.0", features = ["client", "http1", "http2"] }
 
 # native-tls
 native-tls = { version = "0.2.11", features = ["alpn"], optional = true }
@@ -60,15 +55,13 @@ rustls-native-certs = { version = "0.6.2", optional = true }
 tokio-rustls = { version = "0.24.0", optional = true }
 
 base64 = "0.21.0"
-lazy_static = "1.4.0"
 rand = "0.8"
 hickory-resolver = "0.24.0"
 rand_regex = "0.16.0"
 regex-syntax = "0.7.4"
 url = "2.4.0"
-futures-util = "0.3.28"
 pin-project-lite = "0.2.13"
-http-body-util = "0.1.0-rc.3"
+http-body-util = "0.1.0"
 
 [target.'cfg(unix)'.dependencies]
 rlimit = "0.10.0"
@@ -79,6 +72,5 @@ hyper14 = { package = "hyper", version = "0.14", features = ["full"] }
 assert_cmd = "2.0.2"
 axum = { version = "0.6.20", features = ["http2"] }
 bytes = "1.0"
-http = "0.2"
 lazy_static = "1.4.0"
 regex = "1.9.6"

src/client.rs

@@ -1,6 +1,7 @@
 use futures::future::FutureExt;
 use http_body_util::Full;
 use hyper::body::{Body, Incoming};
+use hyper::http;
 use rand::prelude::*;
 use std::pin::Pin;
 use std::sync::Arc;

src/main.rs

@@ -2,8 +2,11 @@ use anyhow::Context;
 use clap::Parser;
 use crossterm::tty::IsTty;
 use futures::prelude::*;
-use http::header::{HeaderName, HeaderValue};
 use humantime::Duration;
+use hyper::http::{
+    self,
+    header::{HeaderName, HeaderValue},
+};
 use printer::PrintMode;
 use rand::prelude::*;
 use rand_regex::Regex;

src/monitor.rs

@@ -2,6 +2,7 @@ use byte_unit::Byte;
 use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
 use crossterm::ExecutableCommand;
 use flume::TryRecvError;
+use hyper::http;
 use ratatui::backend::CrosstermBackend;
 use ratatui::layout::{Constraint, Direction, Layout};
 use ratatui::style::{Color, Style};

src/printer.rs

@@ -5,7 +5,7 @@ use average::Max;
 use average::Variance;
 use byte_unit::Byte;
 use crossterm::style::{StyledContent, Stylize};
-use http::StatusCode;
+use hyper::http::{self, StatusCode};
 use std::collections::BTreeMap;
 use std::io::Write;
 use std::time::Duration;

src/tokiort.rs

@@ -24,12 +24,12 @@ THE SOFTWARE.
 #![allow(dead_code)]
 //! Various runtimes for hyper
 use std::{
+    future::Future,
     pin::Pin,
     task::{Context, Poll},
     time::{Duration, Instant},
 };
 
-use futures_util::Future;
 use hyper::rt::{Sleep, Timer};
 use pin_project_lite::pin_project;
 

tests/tests.rs

@@ -14,6 +14,7 @@ use axum::{
 use http::{HeaderMap, Request, Response};
 use hyper14::{
     body::to_bytes,
+    http,
     server::conn::AddrIncoming,
     service::{make_service_fn, service_fn},
     Body,