Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,11 @@ rsqlite-vfs = { path = "crates/rsqlite-vfs" }
# <https://github.com/utelle/SQLite3MultipleCiphers>
# <https://utelle.github.io/SQLite3MultipleCiphers>
sqlite3mc = ["wsqlite3-sys/sqlite3mc"]
bindgen = ["wsqlite3-sys/bindgen"]

[dev-dependencies]
wasm-bindgen-test = "0.3.54"

[build-dependencies]
cc = "1.2.27"
bindgen = { version = "0.72", optional = true }

[package.metadata.docs.rs]
targets = ["wasm32-unknown-unknown"]

Expand Down
2 changes: 0 additions & 2 deletions crates/rsqlite-vfs/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
//!
//! This crate also contains a simple operating system independent memvfs implementation
#![no_std]
#![allow(non_upper_case_globals)]
#![allow(non_camel_case_types)]
#![allow(non_snake_case)]

extern crate alloc;
Expand Down
4 changes: 2 additions & 2 deletions crates/wsqlite3-sys/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ fn main() {

if update_bindgen {
#[cfg(not(feature = "sqlite3mc"))]
const SQLITE3_BINDGEN: &str = "src/bindings/sqlite3_bindgen.rs";
const SQLITE3_BINDGEN: &str = "src/sqlite3_bindgen.rs";
#[cfg(feature = "sqlite3mc")]
const SQLITE3_BINDGEN: &str = "src/bindings/sqlite3mc_bindgen.rs";
const SQLITE3_BINDGEN: &str = "src/sqlite3mc_bindgen.rs";
std::fs::copy(&output, SQLITE3_BINDGEN).unwrap();
}
}
Expand Down
47 changes: 0 additions & 47 deletions crates/wsqlite3-sys/lib.rs

This file was deleted.

11 changes: 0 additions & 11 deletions crates/wsqlite3-sys/src/bindgen/mod.rs

This file was deleted.

1 change: 0 additions & 1 deletion crates/wsqlite3-sys/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//! This module is codegen from build.rs
#![no_std]
#![allow(non_upper_case_globals)]
#![allow(non_camel_case_types)]
#![allow(non_snake_case)]

Expand Down
4 changes: 2 additions & 2 deletions script/printf.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
TAG=6.3.0
curl -L https://github.com/eyalroz/printf/archive/refs/tags/v$TAG.zip > $TAG.zip
unzip -p "$TAG.zip" "printf-$TAG/src/printf/printf.c" > "shim/printf/printf.c"
unzip -p "$TAG.zip" "printf-$TAG/src/printf/printf.h" > "shim/printf/printf.h"
unzip -p "$TAG.zip" "printf-$TAG/src/printf/printf.c" > "crates/wsqlite3-sys/shim/printf/printf.c"
unzip -p "$TAG.zip" "printf-$TAG/src/printf/printf.h" > "crates/wsqlite3-sys/shim/printf/printf.h"
rm $TAG.zip
6 changes: 3 additions & 3 deletions script/sqlite3_upgrade.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SQLITE=sqlite-amalgamation-3510100
curl -O https://sqlite.org/2025/$SQLITE.zip
unzip -p "$SQLITE.zip" "$SQLITE/sqlite3.c" > "sqlite3/sqlite3.c"
unzip -p "$SQLITE.zip" "$SQLITE/sqlite3.h" > "sqlite3/sqlite3.h"
unzip -p "$SQLITE.zip" "$SQLITE/sqlite3ext.h" > "sqlite3/sqlite3ext.h"
unzip -p "$SQLITE.zip" "$SQLITE/sqlite3.c" > "crates/wsqlite3-sys/sqlite3/sqlite3.c"
unzip -p "$SQLITE.zip" "$SQLITE/sqlite3.h" > "crates/wsqlite3-sys/sqlite3/sqlite3.h"
unzip -p "$SQLITE.zip" "$SQLITE/sqlite3ext.h" > "crates/wsqlite3-sys/sqlite3/sqlite3ext.h"
rm -f "$SQLITE.zip"
4 changes: 2 additions & 2 deletions script/sqlite3mc_upgrade.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
SQLITE=sqlite3mc-2.2.6-sqlite-3.51.1-amalgamation
curl -L https://github.com/utelle/SQLite3MultipleCiphers/releases/latest/download/$SQLITE.zip > $SQLITE.zip
unzip -p "$SQLITE.zip" "sqlite3mc_amalgamation.c" > "sqlite3mc/sqlite3mc_amalgamation.c"
unzip -p "$SQLITE.zip" "sqlite3mc_amalgamation.h" > "sqlite3mc/sqlite3mc_amalgamation.h"
unzip -p "$SQLITE.zip" "sqlite3mc_amalgamation.c" > "crates/wsqlite3-sys/sqlite3mc/sqlite3mc_amalgamation.c"
unzip -p "$SQLITE.zip" "sqlite3mc_amalgamation.h" > "crates/wsqlite3-sys/sqlite3mc/sqlite3mc_amalgamation.h"
rm -f "$SQLITE.zip"
4 changes: 0 additions & 4 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
#![doc = include_str!("../README.md")]
#![no_std]
#![cfg_attr(target_feature = "atomics", feature(stdarch_wasm_atomic_wait))]
#![allow(clippy::missing_safety_doc)]
#![allow(non_upper_case_globals)]
#![allow(non_camel_case_types)]
#![allow(non_snake_case)]

extern crate alloc;

Expand Down
3 changes: 3 additions & 0 deletions src/shim.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,10 @@ impl OsCallback for WasmOsCallback {
}
}

#[allow(non_camel_case_types)]
type c_size_t = usize;

#[allow(non_camel_case_types)]
type c_time_t = c_longlong;

#[wasm_bindgen]
Expand Down