actix/actix-web
1
0
Fork 0
mirror of https://github.com/fafhrd91/actix-web synced 2025-08-22 21:55:10 +02:00
Code Issues Releases Wiki Activity

migrate to -utils beta 4 (#2127)

Browse Source
This commit is contained in:
Rob Ede
2021-04-01 15:26:13 +01:00
committed by GitHub
parent a807d33600
commit c8ed8dd1a4
64 changed files with 612 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/middleware/logger.rs
View File

@@ -13,8 +13,9 @@ use std::{
};
use actix_service::{Service, Transform};
use actix_utils::future::{ok, Ready};
use bytes::Bytes;
use futures_util::future::{ok, Ready};
use futures_core::ready;
use log::{debug, warn};
use regex::{Regex, RegexSet};
use time::OffsetDateTime;
@@ -269,7 +270,7 @@ where
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let this = self.project();
let res = match futures_util::ready!(this.fut.poll(cx)) {
let res = match ready!(this.fut.poll(cx)) {
Ok(res) => res,
Err(e) => return Poll::Ready(Err(e)),
};
@@ -588,7 +589,7 @@ impl<'a> fmt::Display for FormatDisplay<'a> {
#[cfg(test)]
mod tests {
use actix_service::{IntoService, Service, Transform};
use futures_util::future::ok;
use actix_utils::future::ok;
use super::*;
use crate::http::{header, StatusCode};