Remove some unstable items from core

simolus3 · simolus3 · commit 4f4354fd9b10 · 2025-10-31T09:59:42.000+01:00
diff --git a/.github/actions/android/action.yml b/.github/actions/android/action.yml
@@ -25,8 +25,8 @@ runs:
     - name: Setup
       shell: bash
       run: |
-        rustup toolchain install nightly-2025-04-15-x86_64-unknown-linux-gnu
-        rustup component add rust-src --toolchain nightly-2025-04-15-x86_64-unknown-linux-gnu
+        rustup toolchain install nightly-2025-10-31-x86_64-unknown-linux-gnu
+        rustup component add rust-src --toolchain nightly-2025-10-31-x86_64-unknown-linux-gnu
         rustup target add \
           aarch64-linux-android \
           armv7-linux-androideabi \
diff --git a/.github/actions/linux/action.yml b/.github/actions/linux/action.yml
@@ -7,7 +7,7 @@ runs:
     - name: Install Rust Nightly
       uses: dtolnay/rust-toolchain@stable
       with:
-        toolchain: nightly-2025-04-15
+        toolchain: nightly-2025-10-31
         components: rust-src
         targets: aarch64-unknown-linux-gnu,x86_64-unknown-linux-gnu,i686-unknown-linux-gnu,riscv64gc-unknown-linux-gnu,armv7-unknown-linux-gnueabihf
     
diff --git a/.github/actions/macos/action.yml b/.github/actions/macos/action.yml
@@ -7,7 +7,7 @@ runs:
     - name: Install Rust Nightly
       uses: dtolnay/rust-toolchain@stable
       with:
-        toolchain: nightly-2025-04-15
+        toolchain: nightly-2025-10-31
         components: rust-src
         targets: x86_64-apple-darwin,aarch64-apple-darwin
     
diff --git a/.github/actions/wasm/action.yml b/.github/actions/wasm/action.yml
@@ -7,7 +7,7 @@ runs:
     - name: Install Rust Nightly
       uses: dtolnay/rust-toolchain@stable
       with:
-        toolchain: nightly-2025-04-15
+        toolchain: nightly-2025-10-31
         components: rust-src
 
     - name: Setup emsdk
diff --git a/.github/actions/windows/action.yml b/.github/actions/windows/action.yml
@@ -7,7 +7,7 @@ runs:
     - name: Install Rust Nightly
       uses: dtolnay/rust-toolchain@stable
       with:
-        toolchain: nightly-2025-04-15
+        toolchain: nightly-2025-10-31
         components: rust-src
         targets: x86_64-pc-windows-msvc,aarch64-pc-windows-msvc,i686-pc-windows-msvc
 
diff --git a/.github/actions/xcframework/action.yml b/.github/actions/xcframework/action.yml
@@ -7,8 +7,8 @@ runs:
     - name: Setup
       shell: bash
       run: |
-        rustup toolchain install nightly-2025-04-15-aarch64-apple-darwin
-        rustup component add rust-src --toolchain nightly-2025-04-15-aarch64-apple-darwin
+        rustup toolchain install nightly-2025-10-31-aarch64-apple-darwin
+        rustup component add rust-src --toolchain nightly-2025-10-31-aarch64-apple-darwin
         rustup target add \
           x86_64-apple-darwin \
           aarch64-apple-darwin \
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -94,7 +94,7 @@ jobs:
       - name: Install Rust Nightly
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: nightly-2025-04-15
+          toolchain: nightly-2025-10-31
           components: rust-src,rustfmt,clippy
 
       - name: Check formatting
diff --git a/crates/core/src/bson/de.rs b/crates/core/src/bson/de.rs
@@ -1,5 +1,3 @@
-use core::assert_matches::debug_assert_matches;
-
 use serde::{
     de::{
         self, DeserializeSeed, EnumAccess, IntoDeserializer, MapAccess, SeqAccess, VariantAccess,
@@ -250,7 +248,10 @@ impl<'de> SeqAccess<'de> for Deserializer<'de> {
         }
 
         // Skip name
-        debug_assert_matches!(self.position, DeserializerPosition::BeforeName { .. });
+        assert!(matches!(
+            self.position,
+            DeserializerPosition::BeforeName { .. }
+        ));
         self.prepare_to_read(true)?;
 
         // And deserialize value!
diff --git a/crates/core/src/bson/mod.rs b/crates/core/src/bson/mod.rs
@@ -16,7 +16,6 @@ pub fn from_bytes<'de, T: Deserialize<'de>>(bytes: &'de [u8]) -> Result<T, BsonE
 #[cfg(test)]
 mod test {
     use alloc::{vec, vec::Vec};
-    use core::assert_matches::assert_matches;
 
     use crate::sync::line::{SyncLine, TokenExpiresIn};
 
@@ -53,7 +52,7 @@ mod test {
         let bson = b"\x1b\x00\x00\x00\x10token_expires_in\x00<\x00\x00\x00\x00";
 
         let expected: SyncLine = from_bytes(bson.as_slice()).expect("should deserialize");
-        assert_matches!(expected, SyncLine::KeepAlive(TokenExpiresIn(60)));
+        assert!(matches!(expected, SyncLine::KeepAlive(TokenExpiresIn(60))))
     }
 
     #[test]
diff --git a/crates/core/src/fix_data.rs b/crates/core/src/fix_data.rs
@@ -151,12 +151,11 @@ pub fn register(db: *mut sqlite::sqlite3) -> Result<(), ResultCode> {
 
 #[cfg(test)]
 mod test {
-    use core::assert_matches::assert_matches;
 
     use super::remove_duplicate_key_encoding;
 
     fn assert_unaffected(source: &str) {
-        assert_matches!(remove_duplicate_key_encoding(source), None);
+        assert!(matches!(remove_duplicate_key_encoding(source), None));
     }
 
     #[test]
diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs
@@ -1,7 +1,5 @@
 #![no_std]
 #![feature(btree_set_entry)]
-#![feature(assert_matches)]
-#![feature(strict_overflow_ops)]
 #![feature(vec_into_raw_parts)]
 
 extern crate alloc;
diff --git a/crates/core/src/state.rs b/crates/core/src/state.rs
@@ -31,7 +31,7 @@ impl DatabaseState {
         Self::default()
     }
 
-    pub fn view_schema(&self) -> Option<Ref<Schema>> {
+    pub fn view_schema(&'_ self) -> Option<Ref<'_, Schema>> {
         let schema_ref = self.schema.borrow();
         if schema_ref.is_none() {
             None
diff --git a/crates/core/src/sync/line.rs b/crates/core/src/sync/line.rs
@@ -325,35 +325,34 @@ impl<'a, 'de: 'a> Deserialize<'de> for OplogData<'a> {
 
 #[cfg(test)]
 mod tests {
-    use core::assert_matches::assert_matches;
 
     use alloc::string::ToString;
 
     use super::*;
 
-    fn deserialize(source: &str) -> SyncLine {
+    fn deserialize(source: &'_ str) -> SyncLine<'_> {
         serde_json::from_str(source).expect("Should have deserialized")
     }
 
     #[test]
     fn parse_token_expires_in() {
-        assert_matches!(
+        assert!(matches!(
             deserialize(r#"{"token_expires_in": 123}"#),
             SyncLine::KeepAlive(TokenExpiresIn(123))
-        );
+        ));
     }
 
     #[test]
     fn parse_checkpoint() {
-        assert_matches!(
+        assert!(matches!(
             deserialize(r#"{"checkpoint": {"last_op_id": "10", "buckets": []}}"#),
             SyncLine::Checkpoint(Checkpoint {
                 last_op_id: 10,
                 write_checkpoint: None,
                 buckets: _,
                 streams: _,
             })
-        );
+        ));
 
         let SyncLine::Checkpoint(checkpoint) = deserialize(
             r#"{"checkpoint": {"last_op_id": "10", "buckets": [{"bucket": "a", "checksum": 10}]}}"#,
@@ -379,7 +378,7 @@ mod tests {
         assert_eq!(bucket.checksum, 10u32.into());
         assert_eq!(bucket.priority, Some(BucketPriority { number: 1 }));
 
-        assert_matches!(
+        assert!(matches!(
             deserialize(
                 r#"{"checkpoint":{"write_checkpoint":null,"last_op_id":"1","buckets":[{"bucket":"a","checksum":0,"priority":3,"count":1}]}}"#
             ),
@@ -389,7 +388,7 @@ mod tests {
                 buckets: _,
                 streams: _,
             })
-        );
+        ));
     }
 
     #[test]
@@ -426,23 +425,23 @@ mod tests {
 
     #[test]
     fn parse_checkpoint_complete() {
-        assert_matches!(
+        assert!(matches!(
             deserialize(r#"{"checkpoint_complete": {"last_op_id": "10"}}"#),
             SyncLine::CheckpointComplete(CheckpointComplete {
                 // last_op_id: 10
             })
-        );
+        ));
     }
 
     #[test]
     fn parse_checkpoint_partially_complete() {
-        assert_matches!(
+        assert!(matches!(
             deserialize(r#"{"partial_checkpoint_complete": {"last_op_id": "10", "priority": 1}}"#),
             SyncLine::CheckpointPartiallyComplete(CheckpointPartiallyComplete {
                 //last_op_id: 10,
                 priority: BucketPriority { number: 1 }
             })
-        );
+        ));
     }
 
     #[test]
@@ -463,7 +462,7 @@ mod tests {
         assert_eq!(data.data.len(), 1);
         let entry = &data.data[0];
         assert_eq!(entry.checksum, 10u32.into());
-        assert_matches!(
+        assert!(matches!(
             &data.data[0],
             OplogEntry {
                 checksum: _,
@@ -474,13 +473,19 @@ mod tests {
                 subkey: None,
                 data: _,
             }
-        );
+        ));
     }
 
     #[test]
     fn parse_unknown() {
-        assert_matches!(deserialize("{\"foo\": {}}"), SyncLine::UnknownSyncLine);
-        assert_matches!(deserialize("{\"foo\": 123}"), SyncLine::UnknownSyncLine);
+        assert!(matches!(
+            deserialize("{\"foo\": {}}"),
+            SyncLine::UnknownSyncLine
+        ));
+        assert!(matches!(
+            deserialize("{\"foo\": 123}"),
+            SyncLine::UnknownSyncLine
+        ));
     }
 
     #[test]
diff --git a/crates/core/src/sync/storage_adapter.rs b/crates/core/src/sync/storage_adapter.rs
@@ -1,4 +1,4 @@
-use core::{assert_matches::debug_assert_matches, fmt::Display};
+use core::fmt::Display;
 
 use alloc::{rc::Rc, string::ToString, vec::Vec};
 use serde::Serialize;
@@ -140,7 +140,7 @@ impl StorageAdapter {
         Ok(())
     }
 
-    pub fn step_progress(&self) -> Result<Option<PersistedBucketProgress>, ResultCode> {
+    pub fn step_progress(&'_ self) -> Result<Option<PersistedBucketProgress<'_>>, ResultCode> {
         if self.progress_stmt.step()? == ResultCode::ROW {
             let bucket = self.progress_stmt.column_text(0)?;
             let count_at_last = self.progress_stmt.column_int64(1);
@@ -181,7 +181,7 @@ impl StorageAdapter {
             .into_db_result(self.db)?;
         bucket_statement.bind_text(1, bucket, sqlite::Destructor::STATIC)?;
         let res = bucket_statement.step()?;
-        debug_assert_matches!(res, ResultCode::ROW);
+        debug_assert_eq!(res, ResultCode::ROW);
 
         let bucket_id = bucket_statement.column_int64(0);
         let last_applied_op = bucket_statement.column_int64(1);
diff --git a/crates/core/src/sync_local.rs b/crates/core/src/sync_local.rs
@@ -483,16 +483,16 @@ impl<'a> RawTableWithCachedStatements<'a> {
     }
 
     fn put_statement(
-        &mut self,
+        &'_ mut self,
         db: *mut sqlite::sqlite3,
-    ) -> Result<&PreparedPendingStatement, PowerSyncError> {
+    ) -> Result<&'_ PreparedPendingStatement<'_>, PowerSyncError> {
         Self::prepare_lazily(db, &mut self.cached_put, &self.definition.put)
     }
 
     fn delete_statement(
-        &mut self,
+        &'_ mut self,
         db: *mut sqlite::sqlite3,
-    ) -> Result<&PreparedPendingStatement, PowerSyncError> {
+    ) -> Result<&'_ PreparedPendingStatement<'_>, PowerSyncError> {
         Self::prepare_lazily(db, &mut self.cached_delete, &self.definition.delete)
     }
 }
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2025-04-15"
+channel = "nightly-2025-10-31"
