Merge pull request #343 from hatoo/axum07

Axum 0.7

Cargo.toml

@@ -62,15 +62,15 @@ regex-syntax = "0.7.4"
 url = "2.4.0"
 pin-project-lite = "0.2.13"
 http-body-util = "0.1.0"
+hyper-util = { version = "0.1.1", features = ["tokio"] }
 
 [target.'cfg(unix)'.dependencies]
 rlimit = "0.10.0"
 jemallocator = "0.5.0"
 
 [dev-dependencies]
-hyper14 = { package = "hyper", version = "0.14", features = ["full"] }
 assert_cmd = "2.0.2"
-axum = { version = "0.6.20", features = ["http2"] }
+axum = { version = "0.7", features = ["http2"] }
 bytes = "1.0"
 lazy_static = "1.4.0"
 regex = "1.9.6"

src/client.rs

@@ -1,17 +1,20 @@
 use futures::future::FutureExt;
 use http_body_util::Full;
-use hyper::body::{Body, Incoming};
-use hyper::http;
+use hyper::{
+    body::{Body, Incoming},
+    http,
+};
+use hyper_util::rt::{TokioExecutor, TokioIo};
 use rand::prelude::*;
-use std::pin::Pin;
-use std::sync::Arc;
+use std::{pin::Pin, sync::Arc};
 use thiserror::Error;
 use tokio::net::TcpStream;
 use url::{ParseError, Url};
 
-use crate::tokiort::{TokioExecutor, TokioIo};
-use crate::url_generator::{UrlGenerator, UrlGeneratorError};
-use crate::ConnectToEntry;
+use crate::{
+    url_generator::{UrlGenerator, UrlGeneratorError},
+    ConnectToEntry,
+};
 
 type SendRequestHttp1 = hyper::client::conn::http1::SendRequest<Full<&'static [u8]>>;
 type SendRequestHttp2 = hyper::client::conn::http2::SendRequest<Full<&'static [u8]>>;
@@ -235,7 +238,7 @@ impl Stream {
         }
     }
     async fn handshake_http2(self) -> Result<SendRequestHttp2, ClientError> {
-        let builder = hyper::client::conn::http2::Builder::new(TokioExecutor);
+        let builder = hyper::client::conn::http2::Builder::new(TokioExecutor::new());
 
         match self {
             Stream::Tcp(stream) => {

src/main.rs

@@ -19,7 +19,6 @@ mod histogram;
 mod monitor;
 mod printer;
 mod timescale;
-mod tokiort;
 mod url_generator;
 
 #[cfg(unix)]

src/monitor.rs

@@ -1,20 +1,25 @@
 use byte_unit::Byte;
-use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
-use crossterm::ExecutableCommand;
+use crossterm::{
+    event::{Event, KeyCode, KeyEvent, KeyModifiers},
+    ExecutableCommand,
+};
 use flume::TryRecvError;
 use hyper::http;
-use ratatui::backend::CrosstermBackend;
-use ratatui::layout::{Constraint, Direction, Layout};
-use ratatui::style::{Color, Style};
-use ratatui::text::{Line, Span};
-use ratatui::widgets::{BarChart, Block, Borders, Gauge, Paragraph};
-use ratatui::Terminal;
-use std::collections::BTreeMap;
-use std::io;
-
-use crate::client::{ClientError, RequestResult};
-use crate::printer::PrintMode;
-use crate::timescale::{TimeLabel, TimeScale};
+use ratatui::{
+    backend::CrosstermBackend,
+    layout::{Constraint, Direction, Layout},
+    style::{Color, Style},
+    text::{Line, Span},
+    widgets::{BarChart, Block, Borders, Gauge, Paragraph},
+    Terminal,
+};
+use std::{collections::BTreeMap, io};
+
+use crate::{
+    client::{ClientError, RequestResult},
+    printer::PrintMode,
+    timescale::{TimeLabel, TimeScale},
+};
 
 /// When the monitor ends
 pub enum EndLine {

src/printer.rs

@@ -1,15 +1,16 @@
-use crate::client::ConnectionTime;
-use crate::client::RequestResult;
-use crate::histogram::histogram;
-use average::Max;
-use average::Variance;
+use crate::{
+    client::{ConnectionTime, RequestResult},
+    histogram::histogram,
+};
+use average::{Max, Variance};
 use byte_unit::Byte;
 use crossterm::style::{StyledContent, Stylize};
 use hyper::http::{self, StatusCode};
-use std::collections::BTreeMap;
-use std::io::Write;
-use std::time::Duration;
-use std::time::Instant;
+use std::{
+    collections::BTreeMap,
+    io::Write,
+    time::{Duration, Instant},
+};
 
 #[derive(Clone, Copy)]
 struct StyleScheme {

src/timescale.rs

@@ -1,5 +1,4 @@
-use std::fmt;
-use std::time::Duration;
+use std::{fmt, time::Duration};
 
 #[derive(Clone, Copy, PartialEq, Eq, Debug)]
 pub enum TimeScale {