From dcff8c799f28060287ca65dab4a58c142db61004 Mon Sep 17 00:00:00 2001 From: Xuanwo Date: Fri, 2 Aug 2024 17:13:16 +0800 Subject: [PATCH] feat: Define monoio MSRV to 1.80 Signed-off-by: Xuanwo --- monoio-compat/Cargo.toml | 1 + monoio-compat/src/lib.rs | 2 -- monoio-macros/Cargo.toml | 1 + monoio/Cargo.toml | 3 +++ monoio/src/driver/uring/mod.rs | 7 ------- monoio/src/lib.rs | 5 ----- monoio/src/net/tcp/tfo/linux.rs | 5 ----- monoio/src/task/waker_fn.rs | 5 ----- 8 files changed, 5 insertions(+), 24 deletions(-) diff --git a/monoio-compat/Cargo.toml b/monoio-compat/Cargo.toml index 4a131954..8a51bf79 100644 --- a/monoio-compat/Cargo.toml +++ b/monoio-compat/Cargo.toml @@ -9,6 +9,7 @@ name = "monoio-compat" readme = "README.md" repository = "https://github.com/bytedance/monoio" version = "0.2.2" +rust-version = "1.80" [dependencies] monoio = { version = "0.2.3", path = "../monoio", default-features = false, features = ["legacy"] } diff --git a/monoio-compat/src/lib.rs b/monoio-compat/src/lib.rs index 39e87af0..209aa25b 100644 --- a/monoio-compat/src/lib.rs +++ b/monoio-compat/src/lib.rs @@ -1,7 +1,5 @@ //! For compat with tokio AsyncRead and AsyncWrite. -#![cfg_attr(feature = "unstable", feature(new_uninit))] - pub mod box_future; mod buf; diff --git a/monoio-macros/Cargo.toml b/monoio-macros/Cargo.toml index f7edcc48..665a57e7 100644 --- a/monoio-macros/Cargo.toml +++ b/monoio-macros/Cargo.toml @@ -9,6 +9,7 @@ name = "monoio-macros" readme = "README.md" repository = "https://github.com/bytedance/monoio" version = "0.1.0" +rust-version = "1.80" [lib] proc-macro = true diff --git a/monoio/Cargo.toml b/monoio/Cargo.toml index 51437299..ff6ff6e7 100644 --- a/monoio/Cargo.toml +++ b/monoio/Cargo.toml @@ -9,6 +9,7 @@ name = "monoio" readme = "../README.md" repository = "https://github.com/bytedance/monoio" version = "0.2.3" +rust-version = "1.80" # common dependencies [dependencies] @@ -61,6 +62,8 @@ tempfile = "3.2" [features] # use nightly only feature flags +# +# This feature has been deprecated and will be removed in the future. unstable = [] # async-cancel will push a async-cancel entry into sq when op is canceled async-cancel = [] diff --git a/monoio/src/driver/uring/mod.rs b/monoio/src/driver/uring/mod.rs index e170d12a..d222bc2d 100644 --- a/monoio/src/driver/uring/mod.rs +++ b/monoio/src/driver/uring/mod.rs @@ -400,13 +400,6 @@ impl UringInner { fn submit(&mut self) -> io::Result<()> { loop { match self.uring.submit() { - #[cfg(feature = "unstable")] - Err(ref e) - if matches!(e.kind(), io::ErrorKind::Other | io::ErrorKind::ResourceBusy) => - { - self.tick()?; - } - #[cfg(not(feature = "unstable"))] Err(ref e) if matches!(e.raw_os_error(), Some(libc::EAGAIN) | Some(libc::EBUSY)) => { diff --git a/monoio/src/lib.rs b/monoio/src/lib.rs index 20cbb72d..07cddead 100644 --- a/monoio/src/lib.rs +++ b/monoio/src/lib.rs @@ -1,12 +1,7 @@ #![doc = include_str!("../../README.md")] #![cfg_attr(docsrs, feature(doc_cfg))] #![warn(missing_docs, unreachable_pub)] -#![allow(stable_features)] #![allow(clippy::macro_metavars_in_unsafe)] -#![cfg_attr(feature = "unstable", feature(io_error_more))] -#![cfg_attr(feature = "unstable", feature(lazy_cell))] -#![cfg_attr(feature = "unstable", feature(stmt_expr_attributes))] -#![cfg_attr(feature = "unstable", feature(thread_local))] #[macro_use] pub mod macros; diff --git a/monoio/src/net/tcp/tfo/linux.rs b/monoio/src/net/tcp/tfo/linux.rs index bea85ed6..8c571c49 100644 --- a/monoio/src/net/tcp/tfo/linux.rs +++ b/monoio/src/net/tcp/tfo/linux.rs @@ -1,10 +1,5 @@ use std::{cell::Cell, io, os::fd::AsRawFd}; -#[cfg(feature = "unstable")] -#[thread_local] -pub(crate) static TFO_CONNECT_AVAILABLE: Cell = Cell::new(true); - -#[cfg(not(feature = "unstable"))] thread_local! { pub(crate) static TFO_CONNECT_AVAILABLE: Cell = const { Cell::new(true) }; } diff --git a/monoio/src/task/waker_fn.rs b/monoio/src/task/waker_fn.rs index da4aae85..53f4da6c 100644 --- a/monoio/src/task/waker_fn.rs +++ b/monoio/src/task/waker_fn.rs @@ -27,11 +27,6 @@ pub(crate) fn dummy_waker() -> Waker { unsafe { Waker::from_raw(raw_waker()) } } -#[cfg(feature = "unstable")] -#[thread_local] -static SHOULD_POLL: Cell = Cell::new(true); - -#[cfg(not(feature = "unstable"))] thread_local! { static SHOULD_POLL: Cell = const { Cell::new(true) }; }