mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-04 13:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

rename DefaultFilter to Base

Browse source
This commit is contained in:
Nikolay Kim 2021-12-20 20:39:20 +06:00
parent 6b2d664931
commit 72d14dfbcc
6 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ntex-io/CHANGES.md
View file

@ -6,6 +6,8 @@
* Better Io/IoRef api separation
* DefaultFilter renamed to Base
## [0.1.0-b.1] - 2021-12-19
* Remove ReadFilter/WriteFilter traits.

8
ntex-io/src/filter.rs
View file

@ -5,15 +5,15 @@ use ntex_bytes::BytesMut;
use super::io::Flags;
use super::{Filter, IoRef, WriteReadiness};
pub struct DefaultFilter(IoRef);
pub struct Base(IoRef);
impl DefaultFilter {
impl Base {
pub(crate) fn new(inner: IoRef) -> Self {
DefaultFilter(inner)
Base(inner)
}
}
impl Filter for DefaultFilter {
impl Filter for Base {
#[inline]
fn shutdown(&self, _: &IoRef) -> Poll<Result<(), io::Error>> {
let mut flags = self.0.flags();

6
ntex-io/src/io.rs
View file

@ -6,7 +6,7 @@ use ntex_bytes::{BytesMut, PoolId, PoolRef};
use ntex_codec::{Decoder, Encoder};
use ntex_util::{future::poll_fn, future::Either, task::LocalWaker, time::Millis};
use super::filter::{DefaultFilter, NullFilter};
use super::filter::{Base, NullFilter};
use super::tasks::{ReadContext, WriteContext};
use super::{Filter, FilterFactory, Handle, IoStream};
@ -49,7 +49,7 @@ enum FilterItem<F> {
Ptr(*mut F),
}
pub struct Io<F = DefaultFilter>(pub(super) IoRef, FilterItem<F>);
pub struct Io<F = Base>(pub(super) IoRef, FilterItem<F>);
#[derive(Clone)]
pub struct IoRef(pub(super) Rc<IoState>);
@ -222,7 +222,7 @@ impl Io {
on_disconnect: RefCell::new(Vec::new()),
});
let filter = Box::new(DefaultFilter::new(IoRef(inner.clone())));
let filter = Box::new(Base::new(IoRef(inner.clone())));
let filter_ref: &'static dyn Filter = unsafe {
let filter: &dyn Filter = filter.as_ref();
std::mem::transmute(filter)

2
ntex-io/src/lib.rs
View file

@ -24,7 +24,7 @@ use ntex_codec::{Decoder, Encoder};
use ntex_util::time::Millis;
pub use self::dispatcher::Dispatcher;
pub use self::filter::DefaultFilter;
pub use self::filter::Base;
pub use self::io::{Io, IoRef, OnDisconnect};
pub use self::tasks::{ReadContext, WriteContext};
pub use self::time::Timer;

8
ntex/src/connect/openssl.rs
View file

@ -3,7 +3,7 @@ use std::{future::Future, io, pin::Pin, task::Context, task::Poll};
use ntex_tls::openssl::{SslConnector as IoSslConnector, SslFilter};
pub use tls_openssl::ssl::{Error as SslError, HandshakeError, SslConnector, SslMethod};
use crate::io::{DefaultFilter, Io};
use crate::io::{Base, Io};
use crate::service::{Service, ServiceFactory};
use crate::util::{PoolId, Ready};
@ -40,7 +40,7 @@ impl<T: Address + 'static> Connector<T> {
pub fn connect<U>(
&self,
message: U,
) -> impl Future<Output = Result<Io<SslFilter<DefaultFilter>>, ConnectError>>
) -> impl Future<Output = Result<Io<SslFilter<Base>>, ConnectError>>
where
Connect<T>: From<U>,
{
@ -87,7 +87,7 @@ impl<T> Clone for Connector<T> {
impl<T: Address + 'static> ServiceFactory for Connector<T> {
type Request = Connect<T>;
type Response = Io<SslFilter<DefaultFilter>>;
type Response = Io<SslFilter<Base>>;
type Error = ConnectError;
type Config = ();
type Service = Connector<T>;
@ -101,7 +101,7 @@ impl<T: Address + 'static> ServiceFactory for Connector<T> {
impl<T: Address + 'static> Service for Connector<T> {
type Request = Connect<T>;
type Response = Io<SslFilter<DefaultFilter>>;
type Response = Io<SslFilter<Base>>;
type Error = ConnectError;
type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>>>>;

8
ntex/src/connect/rustls.rs
View file

@ -5,7 +5,7 @@ pub use tls_rustls::{ClientConfig, ServerName};
use ntex_tls::rustls::TlsConnector;
use crate::io::{DefaultFilter, Io};
use crate::io::{Base, Io};
use crate::service::{Service, ServiceFactory};
use crate::util::{PoolId, Ready};
@ -42,7 +42,7 @@ impl<T: Address + 'static> Connector<T> {
pub fn connect<U>(
&self,
message: U,
) -> impl Future<Output = Result<Io<TlsFilter<DefaultFilter>>, ConnectError>>
) -> impl Future<Output = Result<Io<TlsFilter<Base>>, ConnectError>>
where
Connect<T>: From<U>,
{
@ -84,7 +84,7 @@ impl<T> Clone for Connector<T> {
impl<T: Address + 'static> ServiceFactory for Connector<T> {
type Request = Connect<T>;
type Response = Io<TlsFilter<DefaultFilter>>;
type Response = Io<TlsFilter<Base>>;
type Error = ConnectError;
type Config = ();
type Service = Connector<T>;
@ -98,7 +98,7 @@ impl<T: Address + 'static> ServiceFactory for Connector<T> {
impl<T: Address + 'static> Service for Connector<T> {
type Request = Connect<T>;
type Response = Io<TlsFilter<DefaultFilter>>;
type Response = Io<TlsFilter<Base>>;
type Error = ConnectError;
type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>>>>;