From 98faa61afe437a5e79d728adfa7d3b4b6ecdf7d6 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Tue, 8 Feb 2022 13:37:01 +0000
Subject: [PATCH] fix impl assertions
---
actix-http/src/body/body_stream.rs | 8 ++++----
actix-http/src/body/boxed.rs | 4 ++--
actix-http/src/body/sized_stream.rs | 8 ++++----
awc/src/any_body.rs | 6 +++---
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/actix-http/src/body/body_stream.rs b/actix-http/src/body/body_stream.rs
index cf4f488b..5a12c1e4 100644
--- a/actix-http/src/body/body_stream.rs
+++ b/actix-http/src/body/body_stream.rs
@@ -80,7 +80,7 @@ mod tests {
use futures_core::ready;
use futures_util::{stream, FutureExt as _};
use pin_project_lite::pin_project;
- use static_assertions::{assert_impl_all, assert_not_impl_all};
+ use static_assertions::{assert_impl_all, assert_not_impl_any};
use super::*;
use crate::body::to_bytes;
@@ -91,10 +91,10 @@ mod tests {
assert_impl_all!(BodyStream<stream::Empty<Result<Bytes, Infallible>>>: MessageBody);
assert_impl_all!(BodyStream<stream::Repeat<Result<Bytes, Infallible>>>: MessageBody);
- assert_not_impl_all!(BodyStream<stream::Empty<Bytes>>: MessageBody);
- assert_not_impl_all!(BodyStream<stream::Repeat<Bytes>>: MessageBody);
+ assert_not_impl_any!(BodyStream<stream::Empty<Bytes>>: MessageBody);
+ assert_not_impl_any!(BodyStream<stream::Repeat<Bytes>>: MessageBody);
// crate::Error is not Clone
- assert_not_impl_all!(BodyStream<stream::Repeat<Result<Bytes, crate::Error>>>: MessageBody);
+ assert_not_impl_any!(BodyStream<stream::Repeat<Result<Bytes, crate::Error>>>: MessageBody);
#[actix_rt::test]
async fn skips_empty_chunks() {
diff --git a/actix-http/src/body/boxed.rs b/actix-http/src/body/boxed.rs
index cac6b7eb..c22310c2 100644
--- a/actix-http/src/body/boxed.rs
+++ b/actix-http/src/body/boxed.rs
@@ -105,14 +105,14 @@ impl MessageBody for BoxBody {
#[cfg(test)]
mod tests {
- use static_assertions::{assert_impl_all, assert_not_impl_all};
+ use static_assertions::{assert_impl_all, assert_not_impl_any};
use super::*;
use crate::body::to_bytes;
assert_impl_all!(BoxBody: MessageBody, fmt::Debug, Unpin);
- assert_not_impl_all!(BoxBody: Send, Sync, Unpin);
+ assert_not_impl_any!(BoxBody: Send, Sync, Unpin);
#[actix_rt::test]
async fn nested_boxed_body() {
diff --git a/actix-http/src/body/sized_stream.rs b/actix-http/src/body/sized_stream.rs
index 9c172724..e5e27b28 100644
--- a/actix-http/src/body/sized_stream.rs
+++ b/actix-http/src/body/sized_stream.rs
@@ -76,7 +76,7 @@ mod tests {
use actix_rt::pin;
use actix_utils::future::poll_fn;
use futures_util::stream;
- use static_assertions::{assert_impl_all, assert_not_impl_all};
+ use static_assertions::{assert_impl_all, assert_not_impl_any};
use super::*;
use crate::body::to_bytes;
@@ -87,10 +87,10 @@ mod tests {
assert_impl_all!(SizedStream<stream::Empty<Result<Bytes, Infallible>>>: MessageBody);
assert_impl_all!(SizedStream<stream::Repeat<Result<Bytes, Infallible>>>: MessageBody);
- assert_not_impl_all!(SizedStream<stream::Empty<Bytes>>: MessageBody);
- assert_not_impl_all!(SizedStream<stream::Repeat<Bytes>>: MessageBody);
+ assert_not_impl_any!(SizedStream<stream::Empty<Bytes>>: MessageBody);
+ assert_not_impl_any!(SizedStream<stream::Repeat<Bytes>>: MessageBody);
// crate::Error is not Clone
- assert_not_impl_all!(SizedStream<stream::Repeat<Result<Bytes, crate::Error>>>: MessageBody);
+ assert_not_impl_any!(SizedStream<stream::Repeat<Result<Bytes, crate::Error>>>: MessageBody);
#[actix_rt::test]
async fn skips_empty_chunks() {
diff --git a/awc/src/any_body.rs b/awc/src/any_body.rs
index d09a943a..83007ae2 100644
--- a/awc/src/any_body.rs
+++ b/awc/src/any_body.rs
@@ -160,7 +160,7 @@ impl<S: fmt::Debug> fmt::Debug for AnyBody<S> {
mod tests {
use std::marker::PhantomPinned;
- use static_assertions::{assert_impl_all, assert_not_impl_all};
+ use static_assertions::{assert_impl_all, assert_not_impl_any};
use super::*;
@@ -187,6 +187,6 @@ mod tests {
assert_impl_all!(AnyBody: MessageBody, fmt::Debug, Unpin);
assert_impl_all!(AnyBody<PinType>: MessageBody);
- assert_not_impl_all!(AnyBody: Send, Sync, Unpin);
- assert_not_impl_all!(AnyBody<PinType>: Send, Sync, Unpin);
+ assert_not_impl_any!(AnyBody: Send, Sync, Unpin);
+ assert_not_impl_any!(AnyBody<PinType>: Send, Sync, Unpin);
}