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"...@@ -448,12 +448,6 @@ version = "1.5.1"
448source = "registry+https://github.com/rust-lang/crates.io-index"448source = "registry+https://github.com/rust-lang/crates.io-index"
449checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"449checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53"
450450
451[[package]]
452name = "base64"
453version = "0.22.1"
454source = "registry+https://github.com/rust-lang/crates.io-index"
455checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
456
457[[package]]451[[package]]
458name = "base64"452name = "base64"
459version = "0.23.1"453version = "0.23.1"
...@@ -999,7 +993,7 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"...@@ -999,7 +993,7 @@ checksum = "d8b14ccef22fc6f5a8f4d7d768562a182c04ce9a3b3157b91390b52ddfdf1a76"
999name = "draw"993name = "draw"
1000version = "0.1.0"994version = "0.1.0"
1001dependencies = [995dependencies = [
1002 "base64 0.22.1",996 "base64",
1003 "bytemuck",997 "bytemuck",
1004 "image",998 "image",
1005 "linebender_resource_handle",999 "linebender_resource_handle",
...@@ -2079,7 +2073,7 @@ name = "notebook"...@@ -2079,7 +2073,7 @@ name = "notebook"
2079version = "0.1.0"2073version = "0.1.0"
2080dependencies = [2074dependencies = [
2081 "aes-gcm",2075 "aes-gcm",
2082 "base64 0.22.1",2076 "base64",
2083 "cab",2077 "cab",
2084 "getrandom 0.4.3",2078 "getrandom 0.4.3",
2085 "hmac",2079 "hmac",
...@@ -2468,7 +2462,7 @@ name = "onestore"...@@ -2468,7 +2462,7 @@ name = "onestore"
2468version = "0.1.0"2462version = "0.1.0"
2469dependencies = [2463dependencies = [
2470 "aes",2464 "aes",
2471 "base64 0.22.1",2465 "base64",
2472 "bumpalo",2466 "bumpalo",
2473 "cbc",2467 "cbc",
2474 "file-guard",2468 "file-guard",
...@@ -4015,7 +4009,7 @@ version = "3.4.2"...@@ -4015,7 +4009,7 @@ version = "3.4.2"
4015source = "registry+https://github.com/rust-lang/crates.io-index"4009source = "registry+https://github.com/rust-lang/crates.io-index"
4016checksum = "9a7ac20be9b7726e0bbdbf974c059676d9acb1cd414961f570a4e8231cacd7fc"4010checksum = "9a7ac20be9b7726e0bbdbf974c059676d9acb1cd414961f570a4e8231cacd7fc"
4017dependencies = [4011dependencies = [
4018 "base64 0.23.1",4012 "base64",
4019 "log",4013 "log",
4020 "percent-encoding",4014 "percent-encoding",
4021 "rustls",4015 "rustls",
...@@ -4031,7 +4025,7 @@ version = "0.6.4"...@@ -4031,7 +4025,7 @@ version = "0.6.4"
4031source = "registry+https://github.com/rust-lang/crates.io-index"4025source = "registry+https://github.com/rust-lang/crates.io-index"
4032checksum = "f86fd172ccca569e458f61b6bdd6220965a9ef36e672a6852953b51a0e1583be"4026checksum = "f86fd172ccca569e458f61b6bdd6220965a9ef36e672a6852953b51a0e1583be"
4033dependencies = [4027dependencies = [
4034 "base64 0.23.1",4028 "base64",
4035 "http",4029 "http",
4036 "httparse",4030 "httparse",
4037 "log",4031 "log",
crates/draw/Cargo.toml+1-1
...@@ -19,7 +19,7 @@ parley.workspace = true...@@ -19,7 +19,7 @@ parley.workspace = true
19# std's clock where there is one; the browser's on wasm32-unknown-unknown, whose std has none.19# std's clock where there is one; the browser's on wasm32-unknown-unknown, whose std has none.
20web-time = "1.1"20web-time = "1.1"
2121
22base64 = { version = "0.22.1", optional = true }22base64 = { version = "0.23.1", default-features = false, features = ["std"], optional = true }
23bytemuck = { version = "1.25", features = ["derive"], optional = true }23bytemuck = { version = "1.25", features = ["derive"], optional = true }
24image = { version = "0.25", default-features = false, features = ["gif", "jpeg", "png", "tiff"], optional = true }24image = { version = "0.25", default-features = false, features = ["gif", "jpeg", "png", "tiff"], optional = true }
25linebender_resource_handle = { version = "0.1.1", optional = true }25linebender_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...@@ -20,7 +20,7 @@ tokio = { version = "1", features = ["rt-multi-thread", "time"], optional = true
20zeroize = "1.9.0"20zeroize = "1.9.0"
21# Queued edits of a password-protected section are sealed under a key derived from its own.21# Queued edits of a password-protected section are sealed under a key derived from its own.
22aes-gcm = "0.11.1"22aes-gcm = "0.11.1"
23base64 = "0.22.1"23base64 = { version = "0.23.1", default-features = false, features = ["std"] }
24getrandom = "0.4.3"24getrandom = "0.4.3"
25hmac = "0.13.0"25hmac = "0.13.0"
26# OneNote packages (.onepkg) are cabinet files.26# OneNote packages (.onepkg) are cabinet files.
crates/onestore/Cargo.toml+1-1
...@@ -5,7 +5,7 @@ edition = "2024"...@@ -5,7 +5,7 @@ edition = "2024"
5publish = false5publish = false
66
7[dependencies]7[dependencies]
8base64 = "0.22.1"8base64 = { version = "0.23.1", default-features = false, features = ["std"] }
9bumpalo = "3.20.3"9bumpalo = "3.20.3"
10serde_json = "1.0.151"10serde_json = "1.0.151"
11md5 = "0.8.1"11md5 = "0.8.1"
fuzz/Cargo.lock+69-2
...@@ -52,9 +52,9 @@ checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"...@@ -52,9 +52,9 @@ checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
5252
53[[package]]53[[package]]
54name = "base64"54name = "base64"
55version = "0.22.1"55version = "0.23.1"
56source = "registry+https://github.com/rust-lang/crates.io-index"56source = "registry+https://github.com/rust-lang/crates.io-index"
57checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"57checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
5858
59[[package]]59[[package]]
60name = "bitflags"60name = "bitflags"
...@@ -136,6 +136,7 @@ dependencies = [...@@ -136,6 +136,7 @@ dependencies = [
136 "serde",136 "serde",
137 "serde_json",137 "serde_json",
138 "skrifa",138 "skrifa",
139 "web-time",
139]140]
140141
141[[package]]142[[package]]
...@@ -292,6 +293,7 @@ name = "draw"...@@ -292,6 +293,7 @@ name = "draw"
292version = "0.1.0"293version = "0.1.0"
293dependencies = [294dependencies = [
294 "parley",295 "parley",
296 "web-time",
295]297]
296298
297[[package]]299[[package]]
...@@ -384,6 +386,30 @@ dependencies = [...@@ -384,6 +386,30 @@ dependencies = [
384 "yeslogic-fontconfig-sys",386 "yeslogic-fontconfig-sys",
385]387]
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
387[[package]]413[[package]]
388name = "getrandom"414name = "getrandom"
389version = "0.4.3"415version = "0.4.3"
...@@ -391,9 +417,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"...@@ -391,9 +417,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
391checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"417checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099"
392dependencies = [418dependencies = [
393 "cfg-if",419 "cfg-if",
420 "js-sys",
394 "libc",421 "libc",
395 "r-efi",422 "r-efi",
396 "rand_core",423 "rand_core",
424 "wasm-bindgen",
397]425]
398426
399[[package]]427[[package]]
...@@ -627,6 +655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"...@@ -627,6 +655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
627checksum = "ce57d20d1ea864ce2ac172ab472d409214f4fd359f0b2a2775abdf522e2af99e"655checksum = "ce57d20d1ea864ce2ac172ab472d409214f4fd359f0b2a2775abdf522e2af99e"
628dependencies = [656dependencies = [
629 "cfg-if",657 "cfg-if",
658 "futures-util",
630 "wasm-bindgen",659 "wasm-bindgen",
631]660]
632661
...@@ -743,14 +772,19 @@ dependencies = [...@@ -743,14 +772,19 @@ dependencies = [
743 "cab",772 "cab",
744 "getrandom",773 "getrandom",
745 "hmac",774 "hmac",
775 "js-sys",
746 "nix",776 "nix",
747 "onestore",777 "onestore",
778 "rsqlite-vfs",
748 "rusqlite",779 "rusqlite",
749 "serde",780 "serde",
750 "serde_json",781 "serde_json",
751 "sha2",782 "sha2",
752 "tempfile",783 "tempfile",
753 "thiserror",784 "thiserror",
785 "wasm-bindgen",
786 "wasm-bindgen-futures",
787 "web-time",
754 "windows-sys",788 "windows-sys",
755 "zeroize",789 "zeroize",
756]790]
...@@ -828,6 +862,7 @@ dependencies = [...@@ -828,6 +862,7 @@ dependencies = [
828 "serde_json",862 "serde_json",
829 "sha1",863 "sha1",
830 "subtle",864 "subtle",
865 "web-time",
831 "zeroize",866 "zeroize",
832]867]
833868
...@@ -889,6 +924,12 @@ dependencies = [...@@ -889,6 +924,12 @@ dependencies = [
889 "skrifa",924 "skrifa",
890]925]
891926
927[[package]]
928name = "pin-project-lite"
929version = "0.2.17"
930source = "registry+https://github.com/rust-lang/crates.io-index"
931checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd"
932
892[[package]]933[[package]]
893name = "pkg-config"934name = "pkg-config"
894version = "0.3.34"935version = "0.3.34"
...@@ -1104,6 +1145,12 @@ dependencies = [...@@ -1104,6 +1145,12 @@ dependencies = [
1104 "read-fonts",1145 "read-fonts",
1105]1146]
11061147
1148[[package]]
1149name = "slab"
1150version = "0.4.12"
1151source = "registry+https://github.com/rust-lang/crates.io-index"
1152checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
1153
1107[[package]]1154[[package]]
1108name = "smallvec"1155name = "smallvec"
1109version = "1.16.0"1156version = "1.16.0"
...@@ -1283,6 +1330,16 @@ dependencies = [...@@ -1283,6 +1330,16 @@ dependencies = [
1283 "wasm-bindgen-shared",1330 "wasm-bindgen-shared",
1284]1331]
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
1286[[package]]1343[[package]]
1287name = "wasm-bindgen-macro"1344name = "wasm-bindgen-macro"
1288version = "0.2.128"1345version = "0.2.128"
...@@ -1315,6 +1372,16 @@ dependencies = [...@@ -1315,6 +1372,16 @@ dependencies = [
1315 "unicode-ident",1372 "unicode-ident",
1316]1373]
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
1318[[package]]1385[[package]]
1319name = "winapi"1386name = "winapi"
1320version = "0.3.9"1387version = "0.3.9"