fix: a lot of things that do not work (#3)

* ci: fix wrong branch name

* ci: use ubuntu-latest

* fix: and bilock feature, fix compile error

* chore: fix clippy warnings

* feat: trim down flake

---------

Co-authored-by: George Miao <gm@miao.dev>

Author: AsakuraMizu

.github/workflows/ci_check.yml

@@ -3,14 +3,14 @@ name: Check
 on:
   push:
     branches:
-      - master
+      - main
     paths:
       - "Cargo.toml"
       - "**/*.rs"
       - ".github/workflows/ci_check.yml"
   pull_request:
     branches:
-      - master
+      - main
     paths:
       - "Cargo.toml"
       - "**/*.rs"
@@ -25,7 +25,7 @@ env:
 
 jobs:
   check:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust Toolchain

.github/workflows/ci_check_minimal.yml

@@ -3,14 +3,14 @@ name: Check (Minimal Versions)
 on:
   push:
     branches:
-      - master
+      - main
     paths:
       - "Cargo.toml"
       - "**/*.rs"
       - ".github/workflows/ci_check_minimal.yml"
   pull_request:
     branches:
-      - master
+      - main
     paths:
       - "Cargo.toml"
       - "**/*.rs"
@@ -25,7 +25,7 @@ env:
 
 jobs:
   check:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust Toolchain

.github/workflows/ci_format.yml

@@ -3,15 +3,15 @@ name: Check Code Format
 on:
   push:
     branches:
-      - master
+      - main
     paths:
       - "rustfmt.toml"
       - "Cargo.toml"
       - "**/*.rs"
       - ".github/workflows/ci_format.yml"
   pull_request:
     branches:
-      - master
+      - main
     paths:
       - "rustfmt.toml"
       - "**/*.rs"
@@ -22,7 +22,7 @@ env:
 
 jobs:
   check:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Setup Rust Toolchain

Cargo.toml

@@ -23,6 +23,7 @@ watch = ["dep:see"]
 mutex = ["dep:futures", "dep:slab", "futures?/std"]
 waker_slot = ["dep:futures"]
 event = ["dep:event-listener", "dep:local-event"]
+bilock = ["waker_slot"]
 
 [dev-dependencies]
 futures = { version = "0.3.31", features = ["executor"] }

flake.lock

@@ -27,12 +27,6 @@
       {
         devShells.default = mkShell {
           buildInputs = [
-            go
-            cmake
-            glib
-            lldb
-            openssl
-            pkg-config
             (rust-bin.selectLatestNightlyWith (
               toolchain:
               toolchain.default.override {

flake.nix

@@ -1,8 +1,4 @@
-use std::{
-    cell::Cell,
-    fmt::{Debug, Display},
-    sync::atomic::Ordering,
-};
+use std::{cell::Cell, fmt::Debug, sync::atomic::Ordering};
 
 atomic_int!(AtomicU8(u8));
 atomic_int!(AtomicU16(u16));

src/atomic/unsync.rs

@@ -41,17 +41,16 @@
 #![warn(missing_docs)]
 #![deny(rustdoc::broken_intra_doc_links)]
 
+#[cfg(feature = "bilock")]
+mod bilock;
+#[cfg(feature = "event")]
+mod event;
 #[cfg(feature = "mutex")]
 mod mutex;
-
 #[cfg(feature = "waker_slot")]
 mod waker_slot;
 
-#[cfg(feature = "event")]
-mod event;
-
 mod atomic;
-mod bilock;
 mod flag;
 mod mutex_blocking;
 mod shared;
@@ -63,6 +62,12 @@ pub mod sync {
     #[cfg(feature = "watch")]
     pub use see::sync as watch;
 
+    #[doc(inline)]
+    #[cfg(feature = "bilock")]
+    pub use crate::bilock::sync as bilock;
+    #[doc(inline)]
+    #[cfg(feature = "event")]
+    pub use crate::event::sync as event;
     #[doc(inline)]
     #[cfg(feature = "mutex")]
     pub use crate::mutex::sync as mutex;
@@ -71,8 +76,8 @@ pub mod sync {
     pub use crate::waker_slot::sync as waker_slot;
     #[doc(inline)]
     pub use crate::{
-        atomic::sync as atomic, bilock::sync as bilock, event::sync as event, flag::sync as flag,
-        mutex_blocking::sync as mutex_blocking, shared::sync as shared,
+        atomic::sync as atomic, flag::sync as flag, mutex_blocking::sync as mutex_blocking,
+        shared::sync as shared,
     };
 }
 
@@ -83,6 +88,12 @@ pub mod unsync {
     #[cfg(feature = "watch")]
     pub use see::unsync as watch;
 
+    #[doc(inline)]
+    #[cfg(feature = "bilock")]
+    pub use crate::bilock::unsync as bilock;
+    #[doc(inline)]
+    #[cfg(feature = "event")]
+    pub use crate::event::unsync as event;
     #[doc(inline)]
     #[cfg(feature = "mutex")]
     pub use crate::mutex::unsync as mutex;
@@ -91,8 +102,8 @@ pub mod unsync {
     pub use crate::waker_slot::unsync as waker_slot;
     #[doc(inline)]
     pub use crate::{
-        atomic::unsync as atomic, bilock::unsync as bilock, event::unsync as event,
-        flag::unsync as flag, mutex_blocking::unsync as mutex_blocking, shared::unsync as shared,
+        atomic::unsync as atomic, flag::unsync as flag, mutex_blocking::unsync as mutex_blocking,
+        shared::unsync as shared,
     };
 }
 

src/lib.rs

@@ -54,13 +54,13 @@ pub mod sync {
         type Target = T;
 
         fn deref(&self) -> &Self::Target {
-            &*self.0
+            &self.0
         }
     }
 
     impl<'a, T> DerefMut for MutexGuard<'a, T> {
         fn deref_mut(&mut self) -> &mut Self::Target {
-            &mut *self.0
+            &mut self.0
         }
     }
 
@@ -118,13 +118,13 @@ pub mod unsync {
         type Target = T;
 
         fn deref(&self) -> &Self::Target {
-            &*self.0
+            &self.0
         }
     }
 
     impl<'a, T> DerefMut for MutexGuard<'a, T> {
         fn deref_mut(&mut self) -> &mut Self::Target {
-            &mut *self.0
+            &mut self.0
         }
     }
 }