1
0
Fork 0
mirror of https://github.com/actix/actix-web.git synced 2024-12-16 21:26:34 +00:00

Merge remote-tracking branch 'origin/master' into on-connect-fix

This commit is contained in:
Rob Ede 2021-12-05 23:24:44 +00:00
commit 1aee8a1a58
No known key found for this signature in database
GPG key ID: 97C636207D3EF933
3 changed files with 4 additions and 4 deletions

View file

@ -1,6 +1,6 @@
use std::io;
use actix_http::{http::StatusCode, Error, HttpService, Request, Response};
use actix_http::{Error, HttpService, Request, Response, StatusCode};
use actix_server::Server;
use bytes::BytesMut;
use futures_util::StreamExt as _;

View file

@ -1,8 +1,8 @@
use std::io;
use actix_http::{
body::MessageBody, http::HeaderValue, http::StatusCode, Error, HttpService, Request,
Response,
body::MessageBody, header::HeaderValue, Error, HttpService, Request, Response,
StatusCode,
};
use actix_server::Server;
use bytes::BytesMut;

View file

@ -1,6 +1,6 @@
use std::{convert::Infallible, io};
use actix_http::{http::StatusCode, HttpService, Response};
use actix_http::{HttpService, Response, StatusCode};
use actix_server::Server;
use http::header::HeaderValue;