Remove nightly feature requirement

tokio-rs · Sep 3, 2020 · 687c687 · 687c687
1 parent 6065e35
commit 687c687
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/tokio/src/lib.rs b/tokio/src/lib.rs
@@ -17,10 +17,6 @@
 ))]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 #![cfg_attr(docsrs, feature(doc_alias))]
-#![cfg_attr(
-    all(feature = "nightly", feature = "parking_lot", not(all(loom, test))),
-    feature(const_fn)
-)]
 
 //! A runtime for writing reliable, asynchronous, and slim applications.
 //!

diff --git a/tokio/src/loom/std/atomic_usize.rs b/tokio/src/loom/std/atomic_usize.rs
@@ -16,7 +16,7 @@ impl AtomicUsize {
         AtomicUsize { inner }
     }
 
-    #[cfg(all(feature = "nightly", feature = "parking_lot", not(all(loom, test)),))]
+    #[cfg(all(feature = "parking_lot", not(all(loom, test)),))]
     pub(crate) const fn const_new(val: usize) -> AtomicUsize {
         let inner = UnsafeCell::new(std::sync::atomic::AtomicUsize::new(val));
         AtomicUsize { inner }

diff --git a/tokio/src/loom/std/parking_lot.rs b/tokio/src/loom/std/parking_lot.rs
@@ -27,8 +27,8 @@ impl<T> Mutex<T> {
     }
 
     #[inline]
-    #[cfg(all(feature = "nightly", feature = "parking_lot", not(all(loom, test)),))]
-    #[cfg_attr(docsrs, doc(cfg(all(feature = "parking_lot", feature = "nightly"))))]
+    #[cfg(all(feature = "parking_lot", not(all(loom, test)),))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "parking_lot",))))]
     pub(crate) const fn const_new(t: T) -> Mutex<T> {
         Mutex(parking_lot::const_mutex(t))
     }

diff --git a/tokio/src/sync/batch_semaphore.rs b/tokio/src/sync/batch_semaphore.rs
@@ -126,13 +126,13 @@ impl Semaphore {
     /// Creates a new semaphore with the initial number of permits
     ///
     /// Maximum number of permits on 32-bit platforms is `1<<29`.
-    #[cfg(all(feature = "nightly", feature = "parking_lot", not(all(loom, test)),))]
+    #[cfg(all(feature = "parking_lot", not(all(loom, test)),))]
     pub(crate) const fn const_new(permits: usize) -> Self {
         // FIXME: assertions and by extension panics are still being worked on: https://github.com/rust-lang/rust/issues/74925
         Self {
             permits: AtomicUsize::const_new(permits << Self::PERMIT_SHIFT),
             waiters: Mutex::const_new(Waitlist {
-                queue: LinkedList::const_new(),
+                queue: LinkedList::new(),
                 closed: false,
             }),
         }

diff --git a/tokio/src/sync/mutex.rs b/tokio/src/sync/mutex.rs
@@ -226,10 +226,10 @@ impl<T: ?Sized> Mutex<T> {
     /// ```
     /// use tokio::sync::Mutex;
     ///
-    /// static lock: Mutex<i32> = Mutex::const_new(5);
+    /// static _: Mutex<i32> = Mutex::const_new(5);
     /// ```
-    #[cfg(all(feature = "nightly", feature = "parking_lot", not(all(loom, test)),))]
-    #[cfg_attr(docsrs, doc(cfg(all(feature = "parking_lot", feature = "nightly"))))]
+    #[cfg(all(feature = "parking_lot", not(all(loom, test)),))]
+    #[cfg_attr(docsrs, doc(cfg(all(feature = "parking_lot",))))]
     pub const fn const_new(t: T) -> Self
     where
         T: Sized,