Skip to content

Commit 3e2ca9e

Browse files
committed
use patched rusqlite for winsqlite3 x86
1 parent a0e7b9d commit 3e2ca9e

File tree

5 files changed

+19
-18
lines changed

5 files changed

+19
-18
lines changed

Cargo.lock

Lines changed: 9 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
members = ["ytflow", "ytflow-app-util", "ytflow-bin", "ytflow-bin-shared"]
33
resolver = "2"
44

5+
[patch.crates-io]
6+
rusqlite = { git = "https://github.com/YtFlow/rusqlite", branch = "winsqlite-0.31" }
7+
58
[profile.release]
69
debug = true
710
lto = true

ytflow-app-util/Cargo.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ serde_bytes = "0.11"
2323
ciborium = "0.2"
2424
chrono = { version = "*", features = ["serde"] }
2525
uuid = { version = "1", features = ["serde"] }
26-
rusqlite = { version = "0.28", default-features = false }
27-
toml_edit = { version = "0.22", default-features = false, features = ["parse","display"] }
26+
rusqlite = { version = "=0.31", default-features = false }
27+
toml_edit = { version = "0.22", default-features = false, features = [
28+
"parse",
29+
"display",
30+
] }
2831
hex = "0.4"
2932
ytflow = { path = "../ytflow" }

ytflow-app-util/src/profile/import.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub enum ParseTomlProfileError {
1717
TomlError(#[from] toml_edit::TomlError),
1818
#[error(r#""{0}" is required, but is missing"#)]
1919
MissingInfo(String),
20-
#[error(r#"invalid value for field "{0}"#)]
20+
#[error(r#"invalid value for field "{0}""#)]
2121
InvalidValue(String),
2222
#[error("Invalid entry points")]
2323
InvalidEntryPoint,

ytflow/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ serde = { version = "1", features = ["derive"] }
135135
serde_bytes = "0.11"
136136
refinery = { version = "0.8", features = ["rusqlite"] }
137137
refinery-core = "0.8"
138+
rusqlite = { version = "=0.31", features = ["chrono", "winsqlite3"] }
138139
cbor4ii = { version = "0.3", features = ["use_std", "serde1"] }
139140
maxminddb = { version = "0.24", optional = true }
140141

@@ -150,7 +151,6 @@ tokio = { version = "1", features = [
150151
] }
151152

152153
[target.'cfg(windows)'.dependencies]
153-
rusqlite = { version = "0.28", features = ["chrono", "winsqlite3"] }
154154
windows = { version = "0.52", features = [
155155
"Foundation",
156156
"Networking_Connectivity",
@@ -163,9 +163,6 @@ windows = { version = "0.52", features = [
163163
# Keep winapi as dependency
164164
ipconfig = { version = "=0.3.1", default-features = false, optional = true }
165165

166-
[target.'cfg(not(windows))'.dependencies]
167-
rusqlite = { version = "0.28", features = ["chrono"] }
168-
169166
[target.'cfg(target_os = "linux")'.dependencies]
170167
rtnetlink = { version = "0.13", optional = true }
171168
netlink-sys = { version = "0.8", optional = true }

0 commit comments

Comments
 (0)