authorgravatar for git@paperclover.netclover caruso <git@paperclover.net> 2026-10-01 17:44:42-07:00
committergravatar for git@paperclover.netclover caruso <git@paperclover.net> 2026-10-01 19:54:16-07:00
log85f7bddae410504d91c7dbfe15c278c9dd284e50
tree057639df1a10a0f82bf4431d446db488bf35eda8
parentb9dec006c038304dcdfaa441feb86a92361f693f
signature Signed by SSH key SHA256:52mNGHRsVFBDED9IAX5pe+LRWUefqTbxEReunq21QvU

chore: one base64 for the whole build

onestore, notebook and draw asked for base64 0.22 while ureq takes 0.23, so every native binary linked both. They now ask for 0.23 with 0.22's default features, leaving out the SIMD decoder that 0.23 turns on by default. fuzz/Cargo.lock also catches up with the web build's dependencies. Assisted-by: claude-opus-5.5

5 files changed, 77 insertions(+), 16 deletions(-)

Cargo.lock+5-11
......@@ -448,12 +448,6 @@ version = "1.5.1"
448448source = "registry+https://github.com/rust-lang/crates.io-index"
449449checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
450450
451[[package]]
452name = "base64"
453version = "0.22.1"
454source = "registry+https://github.com/rust-lang/crates.io-index"
455checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
456
457451[[package]]
458452name = "base64"
459453version = "0.23.1"
......@@ -999,7 +993,7 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
999993name = "draw"
1000994version = "0.1.0"
1001995dependencies = [
1002 "base64 0.22.1",
996 "base64",
1003997 "bytemuck",
1004998 "image",
1005999 "linebender_resource_handle",
......@@ -2079,7 +2073,7 @@ name = "notebook"
20792073version = "0.1.0"
20802074dependencies = [
20812075 "aes-gcm",
2082 "base64 0.22.1",
2076 "base64",
20832077 "cab",
20842078 "getrandom 0.4.3",
20852079 "hmac",
......@@ -2468,7 +2462,7 @@ name = "onestore"
24682462version = "0.1.0"
24692463dependencies = [
24702464 "aes",
2471 "base64 0.22.1",
2465 "base64",
24722466 "bumpalo",
24732467 "cbc",
24742468 "file-guard",
......@@ -4015,7 +4009,7 @@ version = "3.4.2"
40154009source = "registry+https://github.com/rust-lang/crates.io-index"
40164010checksum = "9a7ac20be9b7726e0bbdbf974c059676d9acb1cd414961f570a4e8231cacd7fc"
40174011dependencies = [
4018 "base64 0.23.1",
4012 "base64",
40194013 "log",
40204014 "percent-encoding",
40214015 "rustls",
......@@ -4031,7 +4025,7 @@ version = "0.6.4"
40314025source = "registry+https://github.com/rust-lang/crates.io-index"
40324026checksum = "f86fd172ccca569e458f61b6bdd6220965a9ef36e672a6852953b51a0e1583be"
40334027dependencies = [
4034 "base64 0.23.1",
4028 "base64",
40354029 "http",
40364030 "httparse",
40374031 "log",
crates/draw/Cargo.toml+1-1
......@@ -19,7 +19,7 @@ parley.workspace = true
1919# std's clock where there is one; the browser's on wasm32-unknown-unknown, whose std has none.
2020web-time = "1.1"
2121
22base64 = { version = "0.22.1", optional = true }
22base64 = { version = "0.23.1", default-features = false, features = ["std"], optional = true }
2323bytemuck = { version = "1.25", features = ["derive"], optional = true }
2424image = { version = "0.25", default-features = false, features = ["gif", "jpeg", "png", "tiff"], optional = true }
2525linebender_resource_handle = { version = "0.1.1", optional = true }
crates/notebook/Cargo.toml+1-1
......@@ -20,7 +20,7 @@ tokio = { version = "1", features = ["rt-multi-thread", "time"], optional = true
2020zeroize = "1.9.0"
2121# Queued edits of a password-protected section are sealed under a key derived from its own.
2222aes-gcm = "0.11.1"
23base64 = "0.22.1"
23base64 = { version = "0.23.1", default-features = false, features = ["std"] }
2424getrandom = "0.4.3"
2525hmac = "0.13.0"
2626# OneNote packages (.onepkg) are cabinet files.
crates/onestore/Cargo.toml+1-1
......@@ -5,7 +5,7 @@ edition = "2024"
55publish = false
66
77[dependencies]
8base64 = "0.22.1"
8base64 = { version = "0.23.1", default-features = false, features = ["std"] }
99bumpalo = "3.20.3"
1010serde_json = "1.0.151"
1111md5 = "0.8.1"
fuzz/Cargo.lock+69-2
......@@ -52,9 +52,9 @@ checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
5252
5353[[package]]
5454name = "base64"
55version = "0.22.1"
55version = "0.23.1"
5656source = "registry+https://github.com/rust-lang/crates.io-index"
57checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
57checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
5858
5959[[package]]
6060name = "bitflags"
......@@ -136,6 +136,7 @@ dependencies = [
136136 "serde",
137137 "serde_json",
138138 "skrifa",
139 "web-time",
139140]
140141
141142[[package]]
......@@ -292,6 +293,7 @@ name = "draw"
292293version = "0.1.0"
293294dependencies = [
294295 "parley",
296 "web-time",
295297]
296298
297299[[package]]
......@@ -384,6 +386,30 @@ dependencies = [
384386 "yeslogic-fontconfig-sys",
385387]
386388
389[[package]]
390name = "futures-core"
391version = "0.3.34"
392source = "registry+https://github.com/rust-lang/crates.io-index"
393checksum = "92d699e522242e69e3003b94ecc1f960f3a5e015aa7c5d7486e65ad01dd94f5e"
394
395[[package]]
396name = "futures-task"
397version = "0.3.34"
398source = "registry+https://github.com/rust-lang/crates.io-index"
399checksum = "cd417de3d1d015fc3bfd2b1ea46dfc7bab72ef86f1cc7cc9c78e728b34a6d1fd"
400
401[[package]]
402name = "futures-util"
403version = "0.3.34"
404source = "registry+https://github.com/rust-lang/crates.io-index"
405checksum = "0d50a92467f8ba5dd6e3ee5d4bd04d73ab2e4e1c44474a0674821dfce14b79bc"
406dependencies = [
407 "futures-core",
408 "futures-task",
409 "pin-project-lite",
410 "slab",
411]
412
387413[[package]]
388414name = "getrandom"
389415version = "0.4.3"
......@@ -391,9 +417,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
391417checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
392418dependencies = [
393419 "cfg-if",
420 "js-sys",
394421 "libc",
395422 "r-efi",
396423 "rand_core",
424 "wasm-bindgen",
397425]
398426
399427[[package]]
......@@ -627,6 +655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
627655checksum = "ce57d20d1ea864ce2ac172ab472d409214f4fd359f0b2a2775abdf522e2af99e"
628656dependencies = [
629657 "cfg-if",
658 "futures-util",
630659 "wasm-bindgen",
631660]
632661
......@@ -743,14 +772,19 @@ dependencies = [
743772 "cab",
744773 "getrandom",
745774 "hmac",
775 "js-sys",
746776 "nix",
747777 "onestore",
778 "rsqlite-vfs",
748779 "rusqlite",
749780 "serde",
750781 "serde_json",
751782 "sha2",
752783 "tempfile",
753784 "thiserror",
785 "wasm-bindgen",
786 "wasm-bindgen-futures",
787 "web-time",
754788 "windows-sys",
755789 "zeroize",
756790]
......@@ -828,6 +862,7 @@ dependencies = [
828862 "serde_json",
829863 "sha1",
830864 "subtle",
865 "web-time",
831866 "zeroize",
832867]
833868
......@@ -889,6 +924,12 @@ dependencies = [
889924 "skrifa",
890925]
891926
927[[package]]
928name = "pin-project-lite"
929version = "0.2.17"
930source = "registry+https://github.com/rust-lang/crates.io-index"
931checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
932
892933[[package]]
893934name = "pkg-config"
894935version = "0.3.34"
......@@ -1104,6 +1145,12 @@ dependencies = [
11041145 "read-fonts",
11051146]
11061147
1148[[package]]
1149name = "slab"
1150version = "0.4.12"
1151source = "registry+https://github.com/rust-lang/crates.io-index"
1152checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
1153
11071154[[package]]
11081155name = "smallvec"
11091156version = "1.16.0"
......@@ -1283,6 +1330,16 @@ dependencies = [
12831330 "wasm-bindgen-shared",
12841331]
12851332
1333[[package]]
1334name = "wasm-bindgen-futures"
1335version = "0.4.78"
1336source = "registry+https://github.com/rust-lang/crates.io-index"
1337checksum = "6ef4c5d3d2cdf5c54f4231181768f5510842e350db025faf1f7163b1030ed928"
1338dependencies = [
1339 "js-sys",
1340 "wasm-bindgen",
1341]
1342
12861343[[package]]
12871344name = "wasm-bindgen-macro"
12881345version = "0.2.128"
......@@ -1315,6 +1372,16 @@ dependencies = [
13151372 "unicode-ident",
13161373]
13171374
1375[[package]]
1376name = "web-time"
1377version = "1.1.0"
1378source = "registry+https://github.com/rust-lang/crates.io-index"
1379checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
1380dependencies = [
1381 "js-sys",
1382 "wasm-bindgen",
1383]
1384
13181385[[package]]
13191386name = "winapi"
13201387version = "0.3.9"