Remove nightly features #134 (#138)

* version bump
* remove dep
* remove async closure dep (unused)
* CI fiddling

Author: mobile-bungalow

.github/workflows/ci.yml

@@ -22,9 +22,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: dtolnay/rust-toolchain@master
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: ${{ env.TOOLCHAIN }}
           components: rustfmt
 
       - name: Cargo fmt
@@ -35,9 +34,8 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: dtolnay/rust-toolchain@master
+      - uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: ${{ env.TOOLCHAIN }}
           components: clippy
 
       - name: Cargo fmt
@@ -65,7 +63,7 @@ jobs:
       fail-fast: false
       matrix:
         rust-target: ["aarch64-apple-ios-sim"]
-        apple-target-os: [ "iOS" ]
+        apple-target-os: ["iOS"]
         build-std: [""]
         include:
           - rust-target: "aarch64-apple-tvos-sim"
@@ -79,9 +77,10 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./tests/support/test_server/
 
+      # needs nightly for now as some ios targets require -Zbuild-std
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: ${{ env.TOOLCHAIN }}
+          toolchain: "nightly"
           components: rust-src
           targets: aarch64-apple-ios-sim
 
@@ -123,8 +122,7 @@ jobs:
           cargo ${{ matrix.build-std }} test --target ${{ matrix.rust-target }} -- -- --test-threads 1
 
       - name: Build phoenix_channel_clients with tls
-        run:
-          cargo build ${{ matrix.build-std }} --target ${{ matrix.rust-target }} --features native-tls
+        run: cargo build ${{ matrix.build-std }} --target ${{ matrix.rust-target }} --features native-tls
 
       - name: Phx server logs
         if: ${{ failure() }}
@@ -140,9 +138,7 @@ jobs:
     runs-on: macos-15
     steps:
       - uses: actions/checkout@v4
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ env.TOOLCHAIN }}
+      - uses: dtolnay/rust-toolchain@stable
       - name: Cache Cargo
         uses: actions/cache@v4
         with:
@@ -168,9 +164,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - uses: ./tests/support/test_server/
-      - uses: dtolnay/rust-toolchain@master
-        with:
-          toolchain: ${{ env.TOOLCHAIN }}
+      - uses: dtolnay/rust-toolchain@stable
 
       - name: Cache Cargo
         uses: actions/cache@v4
@@ -207,9 +201,8 @@ jobs:
       - uses: actions/checkout@v4
       - uses: ./tests/support/test_server/
       - name: Install Rust Nightly
-        uses: dtolnay/rust-toolchain@master
+        uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: ${{ env.TOOLCHAIN }}
           target: x86_64-linux-android
 
       - name: Cache Cargo
@@ -229,7 +222,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           java-version: 17
-          distribution: 'temurin'
+          distribution: "temurin"
 
       - name: Enable KVM
         run: |

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "phoenix_channels_client"
-version = "0.9.0"
+version = "0.9.1"
 rust-version = "1.64"
 authors = ["Paul Schoenfelder <paulschoenfelder@gmail.com>", "Elle Imhoff <Kronic.Deth@gmail.com>"]
 description = "Provides an async-ready client for Phoenix Channels in Rust"

Cargo.toml

@@ -1,6 +1,5 @@
 #![doc = include_str!("../README.md")]
 #![cfg_attr(feature = "nightly", feature(slice_take))]
-#![feature(hash_extract_if)]
 // doc warnings that aren't on by default
 #![warn(missing_docs)]
 #![warn(rustdoc::unescaped_backticks)]

src/lib.rs

@@ -139,10 +139,14 @@ impl PresenceByKey {
         join_tx: &broadcast::Sender<Arc<Join>>,
         leave_tx: &broadcast::Sender<Arc<Leave>>,
     ) {
-        let mut left_presence_by_key: HashMap<String, Presence> = self
-            .0
-            .extract_if(|key, _presence| !new.0.contains_key(key))
-            .collect();
+        let temp_self = std::mem::take(&mut self.0);
+
+        let (mut left_presence_by_key, new_self): (HashMap<_, _>, _) = temp_self
+            .into_iter()
+            .partition(|(key, _)| !new.0.contains_key(key));
+
+        self.0 = new_self;
+
         let mut joined_presence_by_key: HashMap<String, Presence> = Default::default();
 
         for (new_key, mut new_presence) in new.0 {

src/rust/presences/listener.rs

@@ -1,5 +1,4 @@
 #![cfg_attr(feature = "nightly", feature(assert_matches))]
-#![feature(async_closure)]
 
 #[cfg(feature = "nightly")]
 use std::assert_matches::assert_matches;