Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
tantaman committed Oct 11, 2023
1 parent 8c72c3f commit 1db500d
Show file tree
Hide file tree
Showing 8 changed files with 57 additions and 55 deletions.
1 change: 1 addition & 0 deletions core/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ dbg/
dist-ios/
dist-ios-sim/
dist-macos/
test_leak_condition
23 changes: 17 additions & 6 deletions core/rs/bundle_static/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

43 changes: 27 additions & 16 deletions core/rs/core/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions core/rs/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ crate-type = ["rlib"]

[dependencies]
sqlite_nostd = { path="../sqlite-rs-embedded/sqlite_nostd" }
bytes = { version = "1.4", default-features = false }
num-traits = { version = "0.2.15", default-features = false }
num-derive = "0.3"
bytes = { version = "1.5", default-features = false }
num-traits = { version = "0.2.17", default-features = false }
num-derive = "0.4.1"

[dev-dependencies]

Expand Down
21 changes: 0 additions & 21 deletions core/rs/core/src/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,6 @@ pub fn binding_list(num_slots: usize) -> String {
.join(", ")
}

pub fn set_list(columns: &Vec<ColumnInfo>) -> String {
// for each column, add a `col_name = ?` statement
columns
.iter()
.map(|c| format!("\"{col_name}\" = ?", col_name = escape_ident(&c.name)))
.collect::<Vec<_>>()
.join(", ")
}

pub fn as_identifier_list(
columns: &Vec<ColumnInfo>,
prefix: Option<&str>,
Expand All @@ -123,18 +114,6 @@ pub fn as_identifier_list(
Ok(result.join(","))
}

pub fn map_columns<F>(columns: &Vec<ColumnInfo>, map: F) -> Result<Vec<String>, Utf8Error>
where
F: Fn(&str) -> String,
{
let mut result = vec![];
for c in columns {
result.push(map(&c.name))
}

return Ok(result);
}

pub fn escape_ident(ident: &str) -> String {
return ident.replace("\"", "\"\"");
}
Expand Down
14 changes: 7 additions & 7 deletions core/rs/integration_check/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion core/rs/integration_check/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ crate-type = ["staticlib"]
sqlite_nostd = { path="../sqlite-rs-embedded/sqlite_nostd", features=["static", "omit_load_extension"] }
crsql_bundle = { path="../bundle", features=["static", "omit_load_extension", "test"] }
cargo-valgrind = "2.1.0"
libc-print = "0.1.21"
libc-print = "0.1.22"

[build-dependencies]
cc = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion core/rs/sqlite-rs-embedded

0 comments on commit 1db500d

Please sign in to comment.