Make crsqlite working on stable rust

Author: gorbak25

.github/workflows/c-tests.yaml

@@ -25,8 +25,8 @@ jobs:
         if: runner.os == 'Windows'
         run: |
           rm core/rs/integration_check/rust-toolchain.toml
-          rustup component add rust-src --toolchain nightly-2023-10-05-x86_64-pc-windows-gnu
-          rustup default nightly-2023-10-05-x86_64-pc-windows-gnu
+          rustup component add rust-src --toolchain 1.93.0
+          rustup default 1.93.0
 
       - name: Test
         run: |

.github/workflows/rs-tests.yml

@@ -25,8 +25,8 @@ jobs:
         if: runner.os == 'Windows'
         run: |
           find . -name rust-toolchain.toml -exec echo rm {} \;
-          rustup component add rust-src --toolchain nightly-2023-10-05-x86_64-pc-windows-gnu
-          rustup default nightly-2023-10-05-x86_64-pc-windows-gnu
+          rustup component add rust-src --toolchain 1.93.0
+          rustup default 1.93.0
 
       - name: Test Fractindex
         run: |

core/Makefile

@@ -213,7 +213,7 @@ $(TARGET_DBG_LOADABLE): $(dbg_prefix) $(ext_files) $(sqlite3.c) $(rs_lib_dbg_loa
 # Useful for debugging.
 $(TARGET_SQLITE3): $(prefix) $(TARGET_SQLITE3_EXTRA_C) $(rs_lib_dbg_static_cpy) $(shell.c) $(ext_files)
 	$(CC) -g \
-	-DSQLITE_THREADSAFE=0 \
+	-DSQLITE_THREADSAFE=1 \
 	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
 	-DSQLITE_EXTRA_INIT=core_init \
 	-DSQLITE_ENABLE_BYTECODE_VTAB \
@@ -241,7 +241,7 @@ $(TARGET_STATIC): $(prefix) $(ext_files) $(sqlite3.c) $(rs_lib_static_cpy)
 $(TARGET_SQLITE3_VANILLA): $(prefix) $(shell.c) $(sqlite3.c)
 	$(CC) -g \
 	$(DEFINE_SQLITE_PATH) \
-	-DSQLITE_THREADSAFE=0 \
+	-DSQLITE_THREADSAFE=1 \
 	-I./src/ -I$(sqlite_src) \
 	$(sqlite3.c) $(shell.c) \
 	-o $@
@@ -252,7 +252,7 @@ $(TARGET_SQLITE3_EXTRA_C): $(prefix) $(sqlite3.c) src/core_init.c
 # run tests
 $(TARGET_TEST): $(prefix) $(TARGET_SQLITE3_EXTRA_C) src/tests.c src/*.test.c $(ext_files) $(rs_lib_dbg_static_cpy)
 	$(CC) -g -Wall \
-	-DSQLITE_THREADSAFE=0 \
+	-DSQLITE_THREADSAFE=1 \
 	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
 	-DSQLITE_EXTRA_INIT=core_init \
 	-DUNIT_TEST=1 \
@@ -262,7 +262,7 @@ $(TARGET_TEST): $(prefix) $(TARGET_SQLITE3_EXTRA_C) src/tests.c src/*.test.c $(e
 
 $(TARGET_TEST_ASAN): $(prefix) $(TARGET_SQLITE3_EXTRA_C) src/tests.c src/*.test.c $(ext_files) $(rs_lib_dbg_static_cpy)
 	$(CC) -fsanitize=address -g -fno-omit-frame-pointer -Wall \
-	-DSQLITE_THREADSAFE=0 \
+	-DSQLITE_THREADSAFE=1 \
 	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
 	-DSQLITE_EXTRA_INIT=core_init \
 	-DUNIT_TEST=1 \
@@ -272,7 +272,7 @@ $(TARGET_TEST_ASAN): $(prefix) $(TARGET_SQLITE3_EXTRA_C) src/tests.c src/*.test.
 
 $(TARGET_FUZZ): $(prefix) $(TARGET_SQLITE3_EXTRA_C) src/fuzzer.cc $(ext_files)
 	clang -fsanitize=fuzzer \
-	-DSQLITE_THREADSAFE=0 \
+	-DSQLITE_THREADSAFE=1 \
 	-DSQLITE_OMIT_LOAD_EXTENSION=1 \
 	-DSQLITE_EXTRA_INIT=core_init \
 	-I./src/ -I$(sqlite_src) \

core/rs/bundle/rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2023-10-05"
+channel = "1.93.0"
 components = [ "rust-src", "rustfmt", "clippy" ]

core/rs/bundle/src/lib.rs

@@ -1,6 +1,4 @@
 #![no_std]
-#![feature(core_intrinsics)]
-#![feature(lang_items)]
 
 extern crate alloc;
 
@@ -26,25 +24,29 @@ static ALLOCATOR: SQLite3Allocator = SQLite3Allocator {};
 #[cfg(not(feature = "test"))]
 #[panic_handler]
 fn panic(_info: &PanicInfo) -> ! {
-    core::intrinsics::abort()
+    panic!("panic_handler")
 }
 
 // Print panic info for tests
 #[cfg(feature = "test")]
 #[panic_handler]
 fn panic(info: &PanicInfo) -> ! {
     println!("PANIC!: {}", info);
-    core::intrinsics::abort();
+    panic!("panic_handler")
 }
 
+// Otherwise we would need to use nightly features
 #[cfg(not(target_family = "wasm"))]
-#[lang = "eh_personality"]
-extern "C" fn eh_personality() {}
+#[no_mangle]
+extern "C" fn rust_eh_personality() {}
+#[cfg(target_arch = "arm")]
+#[no_mangle]
+extern "C" fn _rust_eh_personality() {}
 
 #[cfg(target_family = "wasm")]
 #[no_mangle]
 pub fn __rust_alloc_error_handler(_: Layout) -> ! {
-    core::intrinsics::abort()
+    panic!("__rust_alloc_error_handler")
 }
 
 #[no_mangle]

core/rs/bundle_static/rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2023-10-05"
+channel = "1.93.0"
 

core/rs/core/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2023-10-05"
+channel = "1.93.0"

core/rs/core/src/lib.rs

@@ -1,5 +1,4 @@
 #![cfg_attr(not(test), no_std)]
-#![feature(vec_into_raw_parts)]
 
 // TODO: these pub mods are exposed for the integration testing
 // we should re-export in a `test` mod such that they do not become public apis

core/rs/fractindex-core/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2023-10-05"
+channel = "1.93.0"

core/rs/fractindex-core/src/lib.rs

@@ -1,6 +1,5 @@
 #![cfg_attr(not(test), no_std)]
 #![allow(non_upper_case_globals)]
-#![feature(core_intrinsics)]
 
 mod as_ordered;
 mod fractindex;