Merge pull request #1617 from tursodatabase/bump-rust

bump rust version, fix warnings

Author: MarinPostma

bindings/wasm/Cargo.toml

@@ -8,5 +8,5 @@ crate-type = ["cdylib"]
 
 [dependencies]
 js-sys = "0.3"
-libsql = { path = "../../libsql", default_features = false, features = ["core"] }
+libsql = { path = "../../libsql", default-features = false, features = ["core"] }
 wasm-bindgen = "0.2"

libsql-ffi/Cargo.toml

@@ -21,3 +21,10 @@ cc = "1.0"
 session = []
 wasmtime-bindings = ["dep:libsql-wasmtime-bindings"]
 multiple-ciphers = []
+bundled-sqlcipher = []
+bundled-sqlcipher-vendored-openssl = []
+with-asan = []
+wasm32-wasi-vfs = []
+unlock_notify = []
+preupdate_hook = []
+sqlcipher = []

libsql-ffi/src/lib.rs

@@ -13,7 +13,11 @@ pub use libsql_wasm::{
     libsql_compile_wasm_module, libsql_free_wasm_module, libsql_run_wasm, libsql_wasm_engine_new,
 };
 
-include!(concat!(env!("OUT_DIR"), "/bindgen.rs"));
+pub use bindgen::*;
+mod bindgen {
+    #![allow(dead_code)]
+    include!(concat!(env!("OUT_DIR"), "/bindgen.rs"));
+}
 
 #[must_use]
 pub fn SQLITE_STATIC() -> sqlite3_destructor_type {

libsql-server/src/http/user/mod.rs

@@ -9,7 +9,6 @@ mod types;
 #[macro_use]
 pub mod timing;
 
-use std::path::Path;
 use std::sync::Arc;
 
 use anyhow::Context;
@@ -257,7 +256,6 @@ pub struct UserApi<A, P, S> {
     pub enable_console: bool,
     pub self_url: Option<String>,
     pub primary_url: Option<String>,
-    pub path: Arc<Path>,
     pub shutdown: Arc<Notify>,
 }
 

libsql-server/src/lib.rs

@@ -180,7 +180,6 @@ struct Services<A, P, S, C> {
     disable_default_namespace: bool,
     db_config: DbConfig,
     user_auth_strategy: Auth,
-    path: Arc<Path>,
     shutdown: Arc<Notify>,
 }
 
@@ -206,7 +205,6 @@ where
             enable_console: self.user_api_config.enable_http_console,
             self_url: self.user_api_config.self_url,
             primary_url: self.user_api_config.primary_url,
-            path: self.path.clone(),
             shutdown: self.shutdown.clone(),
         };
 
@@ -388,7 +386,6 @@ where
             disable_default_namespace: self.disable_default_namespace,
             db_config: self.db_config,
             user_auth_strategy,
-            path: self.path.clone(),
             shutdown,
         }
     }

libsql-server/src/namespace/fork.rs

@@ -19,10 +19,7 @@ use crate::{BLOCKING_RT, LIBSQL_PAGE_SIZE};
 
 use super::broadcasters::BroadcasterHandle;
 use super::meta_store::MetaStoreHandle;
-use super::{
-    Namespace, NamespaceBottomlessDbId, NamespaceConfig, NamespaceName, NamespaceStore,
-    RestoreOption,
-};
+use super::{Namespace, NamespaceConfig, NamespaceName, NamespaceStore, RestoreOption};
 
 type Result<T> = crate::Result<T, ForkError>;
 
@@ -63,7 +60,6 @@ pub struct ForkTask<'a> {
     pub to_namespace: NamespaceName,
     pub to_config: MetaStoreHandle,
     pub restore_to: Option<PointInTimeRestore>,
-    pub bottomless_db_id: NamespaceBottomlessDbId,
     pub ns_config: &'a NamespaceConfig,
     pub resolve_attach: ResolveNamespacePathFn,
     pub store: NamespaceStore,

libsql-server/src/namespace/mod.rs

@@ -694,7 +694,6 @@ impl Namespace {
                     to_namespace: to_ns.clone(),
                     logger,
                     restore_to,
-                    bottomless_db_id,
                     to_config,
                     ns_config,
                     resolve_attach,

libsql-sys/src/lib.rs

@@ -6,6 +6,7 @@ pub mod ffi {
     use zerocopy::byteorder::big_endian::{U16 as bu16, U32 as bu32, U64 as bu64};
 
     /// Patched database header file, in use by libsql
+    #[allow(dead_code)] // <- false positive
     #[repr(C)]
     #[derive(Clone, Copy, zerocopy::FromBytes, zerocopy::FromZeroes, zerocopy::AsBytes, Debug)]
     pub struct Sqlite3DbHeader {

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
 profile = "default"
-channel = "1.78.0"
+channel = "1.80.0"

vendored/rusqlite/Cargo.toml

@@ -65,6 +65,8 @@ extra_check = []
 modern_sqlite = []
 # Build bundled sqlite with -fsanitize=address
 column_decltype = []
+unlock_notify = []
+bundled = []
 
 # Helper feature for enabling most non-build-related optional features
 # or dependencies (except `session`). This is useful for running tests / clippy