Remove setting MSRV deps in CI and use stdlib instead of once_cell where possible

Author: kylebarron

.github/workflows/ci.yml

@@ -126,12 +126,6 @@ jobs:
           toolchain: ${{ matrix.rust }}
           target: ${{ matrix.platform.rust-target }}
 
-      - if: ${{ matrix.msrv == 'MSRV' }}
-        name: Set MSRV dependencies
-        run: |
-          cargo add tokio@=1.38.1
-          cargo update -p once_cell --precise 1.20.3
-
       - name: Build (no features)
         run: cargo build --no-default-features --verbose --target ${{ matrix.platform.rust-target }}
 

src/generic.rs

@@ -27,10 +27,9 @@ use crate::{
 use futures::channel::oneshot;
 #[cfg(feature = "unstable-streams")]
 use futures::{channel::mpsc, SinkExt};
-#[cfg(feature = "unstable-streams")]
-use once_cell::sync::OnceCell;
 use pin_project_lite::pin_project;
 use pyo3::prelude::*;
+use pyo3::sync::PyOnceLock;
 use pyo3::IntoPyObjectExt;
 #[cfg(feature = "unstable-streams")]
 use std::marker::PhantomData;
@@ -1660,10 +1659,10 @@ where
 {
     use std::ffi::CString;
 
-    static GLUE_MOD: OnceCell<Py<PyAny>> = OnceCell::new();
+    static GLUE_MOD: PyOnceLock<Py<PyAny>> = PyOnceLock::new();
     let py = gen.py();
     let glue = GLUE_MOD
-        .get_or_try_init(|| -> PyResult<Py<PyAny>> {
+        .get_or_try_init(py, || -> PyResult<Py<PyAny>> {
             Ok(PyModule::from_code(
                 py,
                 &CString::new(STREAM_GLUE).unwrap(),

src/tokio.rs

@@ -13,17 +13,16 @@
 //! features = ["unstable-streams"]
 //! ```
 
+use std::cell::OnceCell;
 use std::ops::Deref;
+use std::sync::OnceLock;
 use std::{future::Future, pin::Pin, sync::Mutex};
 
 use ::tokio::{
     runtime::{Builder, Runtime},
     task,
 };
-use once_cell::{
-    sync::{Lazy, OnceCell},
-    unsync::OnceCell as UnsyncOnceCell,
-};
+use once_cell::sync::Lazy;
 use pyo3::prelude::*;
 
 use crate::{
@@ -66,7 +65,7 @@ impl Deref for Pyo3Runtime {
 }
 
 static TOKIO_BUILDER: Lazy<Mutex<Builder>> = Lazy::new(|| Mutex::new(multi_thread()));
-static TOKIO_RUNTIME: OnceCell<Pyo3Runtime> = OnceCell::new();
+static TOKIO_RUNTIME: OnceLock<Pyo3Runtime> = OnceLock::new();
 
 impl generic::JoinError for task::JoinError {
     fn is_panic(&self) -> bool {
@@ -80,7 +79,7 @@ impl generic::JoinError for task::JoinError {
 struct TokioRuntime;
 
 tokio::task_local! {
-    static TASK_LOCALS: UnsyncOnceCell<TaskLocals>;
+    static TASK_LOCALS: OnceCell<TaskLocals>;
 }
 
 impl GenericRuntime for TokioRuntime {
@@ -102,7 +101,7 @@ impl ContextExt for TokioRuntime {
     where
         F: Future<Output = R> + Send + 'static,
     {
-        let cell = UnsyncOnceCell::new();
+        let cell = OnceCell::new();
         cell.set(locals).unwrap();
 
         Box::pin(TASK_LOCALS.scope(cell, fut))
@@ -132,7 +131,7 @@ impl LocalContextExt for TokioRuntime {
     where
         F: Future<Output = R> + 'static,
     {
-        let cell = UnsyncOnceCell::new();
+        let cell = OnceCell::new();
         cell.set(locals).unwrap();
 
         Box::pin(TASK_LOCALS.scope(cell, fut))