From b886ff84f11fb928a7f038aefb274f0f5268f2d2 Mon Sep 17 00:00:00 2001 From: Kiril Videlov Date: Wed, 26 Jun 2024 16:21:24 +0200 Subject: [PATCH] refactor: Remove rusqlite dependency and related code. --- Cargo.lock | 47 -------------------------------- Cargo.toml | 1 - crates/gitbutler-core/Cargo.toml | 1 - crates/gitbutler-core/src/id.rs | 14 ---------- 4 files changed, 63 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ec9434e8a..2eae3dd69 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1581,18 +1581,6 @@ dependencies = [ "zune-inflate", ] -[[package]] -name = "fallible-iterator" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7" - -[[package]] -name = "fallible-streaming-iterator" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a" - [[package]] name = "faster-hex" version = "0.9.0" @@ -2141,7 +2129,6 @@ dependencies = [ "regex", "reqwest 0.12.4", "resolve-path", - "rusqlite", "serde", "serde_json", "sha2", @@ -3128,15 +3115,6 @@ dependencies = [ "allocator-api2", ] -[[package]] -name = "hashlink" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7" -dependencies = [ - "hashbrown 0.14.3", -] - [[package]] name = "hdrhistogram" version = "7.5.4" @@ -3810,17 +3788,6 @@ dependencies = [ "redox_syscall 0.4.1", ] -[[package]] -name = "libsqlite3-sys" -version = "0.26.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326" -dependencies = [ - "cc", - "pkg-config", - "vcpkg", -] - [[package]] name = "libssh2-sys" version = "0.3.0" @@ -5441,20 +5408,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "rusqlite" -version = "0.29.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2" -dependencies = [ - "bitflags 2.5.0", - "fallible-iterator", - "fallible-streaming-iterator", - "hashlink", - "libsqlite3-sys", - "smallvec", -] - [[package]] name = "rust_decimal" version = "1.35.0" diff --git a/Cargo.toml b/Cargo.toml index b8181394b..0f97ab10f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,7 +16,6 @@ git2 = { version = "0.18.3", features = ["vendored-openssl", "vendored-libgit2"] uuid = { version = "1.8.0", features = ["serde"] } serde = { version = "1.0", features = ["derive"] } thiserror = "1.0.61" -rusqlite = { version = "0.29.0", features = [ "bundled", "blob" ] } tokio = { version = "1.38.0", default-features = false } gitbutler-git = { path = "crates/gitbutler-git" } diff --git a/crates/gitbutler-core/Cargo.toml b/crates/gitbutler-core/Cargo.toml index 70c9322fb..65aa3a0f4 100644 --- a/crates/gitbutler-core/Cargo.toml +++ b/crates/gitbutler-core/Cargo.toml @@ -34,7 +34,6 @@ rand = "0.8.5" regex = "1.10" reqwest = { version = "0.12.4", features = ["json"] } resolve-path = "0.1.0" -rusqlite.workspace = true serde = { workspace = true, features = ["std"]} serde_json = { version = "1.0", features = [ "std", "arbitrary_precision" ] } sha2 = "0.10.8" diff --git a/crates/gitbutler-core/src/id.rs b/crates/gitbutler-core/src/id.rs index 9e33f515a..9ddfd7834 100644 --- a/crates/gitbutler-core/src/id.rs +++ b/crates/gitbutler-core/src/id.rs @@ -43,20 +43,6 @@ impl Default for Id { } } -impl rusqlite::types::FromSql for Id { - fn column_result(value: rusqlite::types::ValueRef<'_>) -> rusqlite::types::FromSqlResult { - Uuid::parse_str(value.as_str()?) - .map(Into::into) - .map_err(|error| rusqlite::types::FromSqlError::Other(Box::new(error))) - } -} - -impl rusqlite::ToSql for Id { - fn to_sql(&self) -> rusqlite::Result> { - Ok(rusqlite::types::ToSqlOutput::from(self.0.to_string())) - } -} - impl PartialEq for Id { fn eq(&self, other: &Self) -> bool { self.0.eq(&other.0)