diff --git a/Cargo.lock b/Cargo.lock index 804cc918f836d72f2dec229754e3021070773200..d1f0fe356691a12344fb509e59aceba256f5153f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -448,12 +448,6 @@ version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" -[[package]] -name = "base64" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" - [[package]] name = "base64" version = "0.23.1" @@ -999,7 +993,7 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76" name = "draw" version = "0.1.0" dependencies = [ - "base64 0.22.1", + "base64", "bytemuck", "image", "linebender_resource_handle", @@ -2079,7 +2073,7 @@ name = "notebook" version = "0.1.0" dependencies = [ "aes-gcm", - "base64 0.22.1", + "base64", "cab", "getrandom 0.4.3", "hmac", @@ -2468,7 +2462,7 @@ name = "onestore" version = "0.1.0" dependencies = [ "aes", - "base64 0.22.1", + "base64", "bumpalo", "cbc", "file-guard", @@ -4015,7 +4009,7 @@ version = "3.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a7ac20be9b7726e0bbdbf974c059676d9acb1cd414961f570a4e8231cacd7fc" dependencies = [ - "base64 0.23.1", + "base64", "log", "percent-encoding", "rustls", @@ -4031,7 +4025,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f86fd172ccca569e458f61b6bdd6220965a9ef36e672a6852953b51a0e1583be" dependencies = [ - "base64 0.23.1", + "base64", "http", "httparse", "log", diff --git a/crates/draw/Cargo.toml b/crates/draw/Cargo.toml index 3814408b20b83257f9ab06b9a828dba57d46d7aa..aa8792578116a7e385e6d1fcf41b2bb55f057622 100644 --- a/crates/draw/Cargo.toml +++ b/crates/draw/Cargo.toml @@ -19,7 +19,7 @@ parley.workspace = true # std's clock where there is one; the browser's on wasm32-unknown-unknown, whose std has none. web-time = "1.1" -base64 = { version = "0.22.1", optional = true } +base64 = { version = "0.23.1", default-features = false, features = ["std"], optional = true } bytemuck = { version = "1.25", features = ["derive"], optional = true } image = { version = "0.25", default-features = false, features = ["gif", "jpeg", "png", "tiff"], optional = true } linebender_resource_handle = { version = "0.1.1", optional = true } diff --git a/crates/notebook/Cargo.toml b/crates/notebook/Cargo.toml index 64d8d9a330acfabf4465ec6cb20fab2ae49dfec1..649b79c1f3c5143a8bd8283118c4381788342d4d 100644 --- a/crates/notebook/Cargo.toml +++ b/crates/notebook/Cargo.toml @@ -20,7 +20,7 @@ tokio = { version = "1", features = ["rt-multi-thread", "time"], optional = true zeroize = "1.9.0" # Queued edits of a password-protected section are sealed under a key derived from its own. aes-gcm = "0.11.1" -base64 = "0.22.1" +base64 = { version = "0.23.1", default-features = false, features = ["std"] } getrandom = "0.4.3" hmac = "0.13.0" # OneNote packages (.onepkg) are cabinet files. diff --git a/crates/onestore/Cargo.toml b/crates/onestore/Cargo.toml index 57382db507a815990a9a092b240f1fc446490907..b26e624914a0ccbf3452f5541c2b02de114ba4cc 100644 --- a/crates/onestore/Cargo.toml +++ b/crates/onestore/Cargo.toml @@ -5,7 +5,7 @@ edition = "2024" publish = false [dependencies] -base64 = "0.22.1" +base64 = { version = "0.23.1", default-features = false, features = ["std"] } bumpalo = "3.20.3" serde_json = "1.0.151" md5 = "0.8.1" diff --git a/fuzz/Cargo.lock b/fuzz/Cargo.lock index da5b1685e618449b9ff72ad40e06f72e72fc798d..56b37a472cc15ccc04d42e79187187f87c6e03fe 100644 --- a/fuzz/Cargo.lock +++ b/fuzz/Cargo.lock @@ -52,9 +52,9 @@ checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" [[package]] name = "base64" -version = "0.22.1" +version = "0.23.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" +checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5" [[package]] name = "bitflags" @@ -136,6 +136,7 @@ dependencies = [ "serde", "serde_json", "skrifa", + "web-time", ] [[package]] @@ -292,6 +293,7 @@ name = "draw" version = "0.1.0" dependencies = [ "parley", + "web-time", ] [[package]] @@ -384,6 +386,30 @@ dependencies = [ "yeslogic-fontconfig-sys", ] +[[package]] +name = "futures-core" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e" + +[[package]] +name = "futures-task" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd" + +[[package]] +name = "futures-util" +version = "0.3.34" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc" +dependencies = [ + "futures-core", + "futures-task", + "pin-project-lite", + "slab", +] + [[package]] name = "getrandom" version = "0.4.3" @@ -391,9 +417,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", + "js-sys", "libc", "r-efi", "rand_core", + "wasm-bindgen", ] [[package]] @@ -627,6 +655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ce57d20d1ea864ce2ac172ab472d409214f4fd359f0b2a2775abdf522e2af99e" dependencies = [ "cfg-if", + "futures-util", "wasm-bindgen", ] @@ -743,14 +772,19 @@ dependencies = [ "cab", "getrandom", "hmac", + "js-sys", "nix", "onestore", + "rsqlite-vfs", "rusqlite", "serde", "serde_json", "sha2", "tempfile", "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-time", "windows-sys", "zeroize", ] @@ -828,6 +862,7 @@ dependencies = [ "serde_json", "sha1", "subtle", + "web-time", "zeroize", ] @@ -889,6 +924,12 @@ dependencies = [ "skrifa", ] +[[package]] +name = "pin-project-lite" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" + [[package]] name = "pkg-config" version = "0.3.34" @@ -1104,6 +1145,12 @@ dependencies = [ "read-fonts", ] +[[package]] +name = "slab" +version = "0.4.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" + [[package]] name = "smallvec" version = "1.16.0" @@ -1283,6 +1330,16 @@ dependencies = [ "wasm-bindgen-shared", ] +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.78" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ef4c5d3d2cdf5c54f4231181768f5510842e350db025faf1f7163b1030ed928" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "wasm-bindgen-macro" version = "0.2.128" @@ -1315,6 +1372,16 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "winapi" version = "0.3.9"