From cbacdacf9b712093da12468c78d8533c655b015a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 19 Nov 2025 09:57:30 +0000 Subject: [PATCH 1/2] chore(deps): update rust crate mdbook to 0.5.0 --- Cargo.lock | 565 +++++++++++++++++++++++------------------------------ Cargo.toml | 2 +- 2 files changed, 241 insertions(+), 326 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 79a0d50..f9c92dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,15 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "addr2line" -version = "0.24.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1" -dependencies = [ - "gimli", -] - [[package]] name = "adler2" version = "2.0.0" @@ -32,34 +23,6 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" -[[package]] -name = "ammonia" -version = "4.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab99eae5ee58501ab236beb6f20f6ca39be615267b014899c89b2f0bc18a459" -dependencies = [ - "html5ever", - "maplit", - "once_cell", - "tendril", - "url", -] - -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - -[[package]] -name = "android_system_properties" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" -dependencies = [ - "libc", -] - [[package]] name = "annotate-snippets" version = "0.12.5" @@ -222,9 +185,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.8.4" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "021e862c184ae977658b36c4500f7feac3221ca5da43e3f25bd04ab6c79a29b5" +checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425" dependencies = [ "axum-core", "base64", @@ -242,8 +205,7 @@ dependencies = [ "mime", "percent-encoding", "pin-project-lite", - "rustversion", - "serde", + "serde_core", "serde_json", "serde_path_to_error", "serde_urlencoded", @@ -259,9 +221,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.5.2" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68464cd0412f486726fb3373129ef5d2993f90c34bc2bc1c1e9943b2f4fc7ca6" +checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22" dependencies = [ "bytes", "futures-core", @@ -270,28 +232,12 @@ dependencies = [ "http-body-util", "mime", "pin-project-lite", - "rustversion", "sync_wrapper", "tower-layer", "tower-service", "tracing", ] -[[package]] -name = "backtrace" -version = "0.3.74" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a" -dependencies = [ - "addr2line", - "cfg-if", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", - "windows-targets 0.52.6", -] - [[package]] name = "base16" version = "0.2.1" @@ -376,7 +322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "234113d19d0d7d613b40e86fb654acf958910802bcceab913a4f9e7cda03b1a4" dependencies = [ "memchr", - "regex-automata 0.4.9", + "regex-automata", "serde", ] @@ -474,7 +420,7 @@ dependencies = [ "tempfile", "thiserror 2.0.17", "time", - "toml 0.9.8", + "toml", "toml_edit", "tracing", "tracing-chrome", @@ -577,7 +523,7 @@ dependencies = [ "serde-untagged", "serde-value", "thiserror 2.0.17", - "toml 0.9.8", + "toml", "unicode-xid", "url", ] @@ -599,18 +545,6 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9" -[[package]] -name = "chrono" -version = "0.4.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" -dependencies = [ - "android-tzdata", - "iana-time-zone", - "num-traits", - "windows-link 0.1.3", -] - [[package]] name = "clap" version = "4.5.51" @@ -636,9 +570,9 @@ dependencies = [ [[package]] name = "clap_complete" -version = "4.5.58" +version = "4.5.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75bf0b32ad2e152de789bb635ea4d3078f6b838ad7974143e99b99f45a04af4a" +checksum = "8e602857739c5a4291dfa33b5a298aeac9006185229a700e5810a3ef7272d971" dependencies = [ "clap", "clap_lex", @@ -732,7 +666,7 @@ dependencies = [ "convert_case 0.6.0", "pathdiff", "serde", - "toml 0.9.8", + "toml", "winnow", ] @@ -1141,6 +1075,12 @@ dependencies = [ "getrandom 0.2.15", ] +[[package]] +name = "ego-tree" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b2972feb8dffe7bc8c5463b1dacda1b0dfbed3710e50f977d965429692d74cd8" + [[package]] name = "either" version = "1.15.0" @@ -1354,6 +1294,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "font-awesome-as-a-crate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "932dcfbd51320af5f27f1ba02d2e567dec332cac7d2c221ba45d8e767264c4dc" + [[package]] name = "foreign-types" version = "0.3.2" @@ -1540,12 +1486,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "gimli" -version = "0.31.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" - [[package]] name = "git2" version = "0.20.2" @@ -2397,15 +2337,15 @@ checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280" [[package]] name = "globset" -version = "0.4.16" +version = "0.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a1028dfc5f5df5da8a56a73e6c153c9a9708ec57232470703592a3f18e49f5" +checksum = "52dfc19153a48bde0cbd630453615c8151bce3a5adfac7a0aebfbf0a1e1f57e3" dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", + "regex-automata", + "regex-syntax", ] [[package]] @@ -2501,6 +2441,12 @@ dependencies = [ "foldhash", ] +[[package]] +name = "hashbrown" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" + [[package]] name = "hashlink" version = "0.10.0" @@ -2576,16 +2522,13 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.27.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" +checksum = "55d958c2f74b664487a2035fe1dadb032c48718a03b63f3ab0b8537db8549ed4" dependencies = [ "log", - "mac", "markup5ever", - "proc-macro2", - "quote", - "syn", + "match_token", ] [[package]] @@ -2724,30 +2667,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "iana-time-zone" -version = "0.1.63" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" -dependencies = [ - "android_system_properties", - "core-foundation-sys", - "iana-time-zone-haiku", - "js-sys", - "log", - "wasm-bindgen", - "windows-core", -] - -[[package]] -name = "iana-time-zone-haiku" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" -dependencies = [ - "cc", -] - [[package]] name = "icu_collections" version = "1.5.0" @@ -2895,15 +2814,15 @@ dependencies = [ [[package]] name = "ignore" -version = "0.4.23" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d89fd380afde86567dfba715db065673989d6253f42b88179abd3eae47bda4b" +checksum = "d3d782a365a015e0f5c04902246139249abf769125006fbe7649e2ee88169b4a" dependencies = [ "crossbeam-deque", "globset", "log", "memchr", - "regex-automata 0.4.9", + "regex-automata", "same-file", "walkdir", "winapi-util", @@ -2934,12 +2853,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.11.4" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b0f83760fb341a774ed326568e19f5a863af4a952def8c39f9ab92fd95b88e5" +checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f" dependencies = [ "equivalent", - "hashbrown 0.15.5", + "hashbrown 0.16.0", ] [[package]] @@ -2968,17 +2887,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71dd52191aae121e8611f1e8dc3e324dd0dd1dee1e6dd91d10ee07a3cfb4d9d8" -[[package]] -name = "io-uring" -version = "0.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "046fa2d4d00aea763528b4950358d0ead425372445dc8ff86312b3c69ff7727b" -dependencies = [ - "bitflags 2.9.0", - "cfg-if", - "libc", -] - [[package]] name = "is_executable" version = "1.0.4" @@ -3072,9 +2980,9 @@ dependencies = [ [[package]] name = "kqueue" -version = "1.0.8" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a" dependencies = [ "kqueue-sys", "libc", @@ -3399,33 +3307,35 @@ dependencies = [ "quote", ] -[[package]] -name = "maplit" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" - [[package]] name = "markup5ever" -version = "0.12.1" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" +checksum = "311fe69c934650f8f19652b3946075f0fc41ad8757dbb68f1ca14e7900ecc1c3" dependencies = [ "log", - "phf", - "phf_codegen", - "string_cache", - "string_cache_codegen", "tendril", + "web_atoms", +] + +[[package]] +name = "match_token" +version = "0.35.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac84fd3f360fcc43dc5f5d186f02a94192761a080e8bc58621ad4d12296a58cf" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] name = "matchers" -version = "0.1.0" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +checksum = "d1525a2a28c7f4fa0fc98bb91ae755d1e2d1505079e05539e35bc876b5d65ae9" dependencies = [ - "regex-automata 0.1.10", + "regex-automata", ] [[package]] @@ -3447,40 +3357,107 @@ dependencies = [ [[package]] name = "mdbook" -version = "0.4.52" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c284d2855916af7c5919cf9ad897cfc77d3c2db6f55429c7cfb769182030ec" +checksum = "9023c700677d66b6f42113e2d032d7deb05c21ceb9843c06e58f7f1f6b72d219" dependencies = [ - "ammonia", "anyhow", "axum", - "chrono", "clap", "clap_complete", - "elasticlunr-rs", - "env_logger", "futures-util", - "handlebars", - "hex", "ignore", - "log", - "memchr", + "mdbook-core", + "mdbook-driver", + "mdbook-html", + "mdbook-markdown", + "mdbook-preprocessor", + "mdbook-renderer", + "mdbook-summary", "notify", "notify-debouncer-mini", "opener", "pathdiff", - "pulldown-cmark 0.10.3", + "tokio", + "toml", + "tower-http", + "tracing", + "tracing-subscriber", + "walkdir", +] + +[[package]] +name = "mdbook-core" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e6a4d85df323c8e83bcbb5cf6f7dd84a6fa91a4862ff40b3998e2a79e883fef" +dependencies = [ + "anyhow", + "regex", + "serde", + "serde_json", + "toml", + "tracing", +] + +[[package]] +name = "mdbook-driver" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44eb1712be4856025a7fcc5899eede57789c228ce503f3b1a9093ba352cef8ff" +dependencies = [ + "anyhow", + "indexmap", + "mdbook-core", + "mdbook-html", + "mdbook-markdown", + "mdbook-preprocessor", + "mdbook-renderer", + "mdbook-summary", "regex", "serde", "serde_json", - "sha2", "shlex", "tempfile", - "tokio", - "toml 0.5.11", + "toml", "topological-sort", - "tower-http", - "walkdir", + "tracing", +] + +[[package]] +name = "mdbook-html" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ab6bfb7ad2090dc3936ed8fff02844563deab40be7a4307069f6fd2dfc88b62" +dependencies = [ + "anyhow", + "ego-tree", + "elasticlunr-rs", + "font-awesome-as-a-crate", + "handlebars", + "hex", + "html5ever", + "indexmap", + "mdbook-core", + "mdbook-markdown", + "mdbook-renderer", + "pulldown-cmark", + "regex", + "serde", + "serde_json", + "sha2", + "tracing", +] + +[[package]] +name = "mdbook-markdown" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c347cf62a7bad1985596b413750028d0005e30477e75f9511f1bf78f5c191328" +dependencies = [ + "pulldown-cmark", + "regex", + "tracing", ] [[package]] @@ -3489,10 +3466,48 @@ version = "0.2.3" dependencies = [ "anyhow", "log", - "pulldown-cmark 0.13.0", + "pulldown-cmark", "test-log", ] +[[package]] +name = "mdbook-preprocessor" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "92aeb376c7fe9d76e0f551f05b75322db04d5bca1ad12f10726562a258f5e6a4" +dependencies = [ + "anyhow", + "mdbook-core", + "serde", + "serde_json", +] + +[[package]] +name = "mdbook-renderer" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47c2385beb52a1d4cecb4e17ad7e2500c499a5367bf3650b906e5749781eeacf" +dependencies = [ + "anyhow", + "mdbook-core", + "serde", + "serde_json", +] + +[[package]] +name = "mdbook-summary" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f10a00337ba2aef43e39f8807dcb8142275749d9541834567a7055532bcbc1f8" +dependencies = [ + "anyhow", + "mdbook-core", + "memchr", + "pulldown-cmark", + "serde", + "tracing", +] + [[package]] name = "mdbook-tabs" version = "0.2.3" @@ -3503,7 +3518,7 @@ dependencies = [ "log", "mdbook", "mdbook-plugin-utils", - "pulldown-cmark 0.13.0", + "pulldown-cmark", "semver", "serde", "serde-keyvalue", @@ -3525,18 +3540,18 @@ dependencies = [ "mdbook", "mdbook-plugin-utils", "peekread", - "pulldown-cmark 0.13.0", + "pulldown-cmark", "semver", "serde", "serde_json", - "toml 0.9.8", + "toml", ] [[package]] name = "memchr" -version = "2.7.5" +version = "2.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" +checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273" [[package]] name = "memmap2" @@ -3632,12 +3647,11 @@ dependencies = [ [[package]] name = "notify" -version = "8.0.0" +version = "8.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fee8403b3d66ac7b26aee6e40a897d85dc5ce26f44da36b8b73e987cc52e943" +checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" dependencies = [ "bitflags 2.9.0", - "filetime", "fsevent-sys", "inotify", "kqueue", @@ -3646,14 +3660,14 @@ dependencies = [ "mio", "notify-types", "walkdir", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] name = "notify-debouncer-mini" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a689eb4262184d9a1727f9087cd03883ea716682ab03ed24efec57d7716dccb8" +checksum = "17849edfaabd9a5fef1c606d99cfc615a8e99f7ac4366406d86c7942a3184cf2" dependencies = [ "log", "notify", @@ -3669,12 +3683,11 @@ checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d" [[package]] name = "nu-ansi-term" -version = "0.46.0" +version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "overload", - "winapi", + "windows-sys 0.60.2", ] [[package]] @@ -3717,15 +3730,6 @@ dependencies = [ "libc", ] -[[package]] -name = "object" -version = "0.36.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" -dependencies = [ - "memchr", -] - [[package]] name = "oco_ref" version = "0.2.1" @@ -3844,12 +3848,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "p384" version = "0.13.1" @@ -4209,18 +4207,6 @@ dependencies = [ "parking_lot", ] -[[package]] -name = "pulldown-cmark" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76979bea66e7875e7509c4ec5300112b316af87fa7a252ca91c448b32dfe3993" -dependencies = [ - "bitflags 2.9.0", - "memchr", - "pulldown-cmark-escape 0.10.1", - "unicase", -] - [[package]] name = "pulldown-cmark" version = "0.13.0" @@ -4230,16 +4216,10 @@ dependencies = [ "bitflags 2.9.0", "getopts", "memchr", - "pulldown-cmark-escape 0.11.0", + "pulldown-cmark-escape", "unicase", ] -[[package]] -name = "pulldown-cmark-escape" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd348ff538bc9caeda7ee8cad2d1d48236a1f443c1fa3913c6a02fe0043b1dd3" - [[package]] name = "pulldown-cmark-escape" version = "0.11.0" @@ -4412,42 +4392,27 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.1" +version = "1.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.9", - "regex-syntax 0.8.5", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.4.9" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.5", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.8.5" @@ -4504,12 +4469,6 @@ dependencies = [ "smallvec", ] -[[package]] -name = "rustc-demangle" -version = "0.1.24" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" - [[package]] name = "rustc-hash" version = "2.1.1" @@ -5111,15 +5070,15 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.20.0" +version = "3.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1" +checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16" dependencies = [ "fastrand", "getrandom 0.3.3", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.60.2", ] [[package]] @@ -5282,27 +5241,24 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.47.1" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89e49afdadebb872d3145a5638b59eb0691ea23e46ca484037cfab3b76b95038" +checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" dependencies = [ - "backtrace", "bytes", - "io-uring", "libc", "mio", "pin-project-lite", - "slab", "socket2", "tokio-macros", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] name = "tokio-macros" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" +checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" dependencies = [ "proc-macro2", "quote", @@ -5311,9 +5267,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.26.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084" +checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857" dependencies = [ "futures-util", "log", @@ -5334,15 +5290,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - [[package]] name = "toml" version = "0.9.8" @@ -5514,14 +5461,14 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.19" +version = "0.3.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8189decb5ac0fa7bc8b96b7cb9b2701d60d48805aca84a238004d665fcc4008" +checksum = "2054a14f5307d601f88daf0553e1cbf472acc4f2c51afab632431cdcd72124d5" dependencies = [ "matchers", "nu-ansi-term", "once_cell", - "regex", + "regex-automata", "sharded-slab", "smallvec", "thread_local", @@ -5532,9 +5479,9 @@ dependencies = [ [[package]] name = "tungstenite" -version = "0.26.2" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4793cb5e56680ecbb1d843515b23b6de9a75eb04b66643e256a396d43be33c13" +checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442" dependencies = [ "bytes", "data-encoding", @@ -5847,6 +5794,18 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web_atoms" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57ffde1dc01240bdf9992e3205668b235e59421fd085e8a317ed98da0178d414" +dependencies = [ + "phf", + "phf_codegen", + "string_cache", + "string_cache_codegen", +] + [[package]] name = "winapi" version = "0.3.9" @@ -5878,41 +5837,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-core" -version = "0.61.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" -dependencies = [ - "windows-implement", - "windows-interface", - "windows-link 0.1.3", - "windows-result", - "windows-strings", -] - -[[package]] -name = "windows-implement" -version = "0.60.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "windows-interface" -version = "0.59.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "windows-link" version = "0.1.3" @@ -5925,24 +5849,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" -[[package]] -name = "windows-result" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" -dependencies = [ - "windows-link 0.1.3", -] - -[[package]] -name = "windows-strings" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" -dependencies = [ - "windows-link 0.1.3", -] - [[package]] name = "windows-sys" version = "0.48.0" @@ -5979,6 +5885,15 @@ dependencies = [ "windows-targets 0.53.3", ] +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link 0.2.1", +] + [[package]] name = "windows-targets" version = "0.48.5" diff --git a/Cargo.toml b/Cargo.toml index b876df8..0cd84fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,7 @@ anyhow = "1.0.86" clap = { version = "4.5.8", features = ["derive"] } env_logger = "0.11.3" log = "0.4.22" -mdbook = "0.4.43" +mdbook = "0.5.0" pulldown-cmark = "0.13.0" semver = "1.0.23" serde = { version = "1.0.204", features = ["derive"] } From 03db7608960bc9301d3128815b9e37548765d460 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABlle=20Huisman?= Date: Wed, 19 Nov 2025 11:23:01 +0100 Subject: [PATCH 2/2] fix(deps): migrate to mdBook v0.5 --- Cargo.lock | 506 +----------------- Cargo.toml | 5 +- book/book.toml | 1 - deny.toml | 1 + packages/mdbook-tabs/Cargo.toml | 3 +- packages/mdbook-tabs/src/bin/mdbook-tabs.rs | 15 +- packages/mdbook-tabs/src/parser/tabs.rs | 2 +- packages/mdbook-tabs/src/preprocessor.rs | 13 +- packages/mdbook-trunk/Cargo.toml | 5 +- packages/mdbook-trunk/src/bin/mdbook-trunk.rs | 21 +- .../mdbook-trunk/src/parser/definition.rs | 2 +- packages/mdbook-trunk/src/parser/iframe.rs | 2 +- packages/mdbook-trunk/src/preprocessor.rs | 13 +- packages/mdbook-trunk/src/renderer.rs | 4 +- 14 files changed, 67 insertions(+), 526 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f9c92dc..71e7ad6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -183,61 +183,6 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" -[[package]] -name = "axum" -version = "0.8.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b098575ebe77cb6d14fc7f32749631a6e44edbef6b796f89b020e99ba20d425" -dependencies = [ - "axum-core", - "base64", - "bytes", - "form_urlencoded", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-util", - "itoa", - "matchit", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "serde_core", - "serde_json", - "serde_path_to_error", - "serde_urlencoded", - "sha1", - "sync_wrapper", - "tokio", - "tokio-tungstenite", - "tower", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "axum-core" -version = "0.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59446ce19cd142f8833f856eb31f3eb097812d1479ab224f54d72428ca21ea22" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "http-body-util", - "mime", - "pin-project-lite", - "sync_wrapper", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "base16" version = "0.2.1" @@ -262,12 +207,6 @@ version = "1.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "89e25b6adfb930f02d1981565a6e5d9c547ac15a96606256d3b59040e5cd4ca3" -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - [[package]] name = "bitflags" version = "2.9.0" @@ -942,12 +881,6 @@ dependencies = [ "parking_lot_core", ] -[[package]] -name = "data-encoding" -version = "2.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "575f75dfd25738df5b91b8e43e14d44bda14637a58fae779fd2b064f8bf3e010" - [[package]] name = "der" version = "0.7.9" @@ -1097,18 +1030,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "elasticlunr-rs" -version = "3.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41e83863a500656dfa214fee6682de9c5b9f03de6860fec531235ed2ae9f6571" -dependencies = [ - "regex", - "serde", - "serde_derive", - "serde_json", -] - [[package]] name = "elliptic-curve" version = "0.13.8" @@ -1330,15 +1251,6 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" -[[package]] -name = "fsevent-sys" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" -dependencies = [ - "libc", -] - [[package]] name = "futf" version = "0.1.5" @@ -1492,7 +1404,7 @@ version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2deb07a133b1520dc1a5690e9bd08950108873d7ed5de38dcc74d3b5ebffa110" dependencies = [ - "bitflags 2.9.0", + "bitflags", "libc", "libgit2-sys", "log", @@ -1670,7 +1582,7 @@ version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f012703eb67e263c6c1fc96649fec47694dd3e5d2a91abfc65e4a6a6dc85309" dependencies = [ - "bitflags 2.9.0", + "bitflags", "bstr", "gix-path", "libc", @@ -1830,7 +1742,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b947db8366823e7a750c254f6bb29e27e17f27e457bf336ba79b32423db62cd5" dependencies = [ - "bitflags 2.9.0", + "bitflags", "bstr", "gix-features", "gix-path", @@ -1878,7 +1790,7 @@ version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2af39fde3ce4ce11371d9ce826f2936ec347318f2d1972fe98c2e7134e267e25" dependencies = [ - "bitflags 2.9.0", + "bitflags", "bstr", "filetime", "fnv", @@ -1917,7 +1829,7 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d58d4c9118885233be971e0d7a589f5cfb1a8bd6cb6e2ecfb0fc6b1b293c83b" dependencies = [ - "bitflags 2.9.0", + "bitflags", "gix-commitgraph", "gix-date", "gix-hash", @@ -2033,7 +1945,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "daedead611c9bd1f3640dc90a9012b45f790201788af4d659f28d94071da7fba" dependencies = [ - "bitflags 2.9.0", + "bitflags", "bstr", "gix-attributes", "gix-config-value", @@ -2163,7 +2075,7 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09f7053ed7c66633b56c57bc6ed3377be3166eaf3dc2df9f1c5ec446df6fdf2c" dependencies = [ - "bitflags 2.9.0", + "bitflags", "gix-path", "libc", "windows-sys 0.59.0", @@ -2264,7 +2176,7 @@ version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c7cdc82509d792ba0ad815f86f6b469c7afe10f94362e96c4494525a6601bdd5" dependencies = [ - "bitflags 2.9.0", + "bitflags", "gix-commitgraph", "gix-date", "gix-hash", @@ -2577,47 +2489,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "http-body" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" -dependencies = [ - "bytes", - "http", -] - -[[package]] -name = "http-body-util" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", -] - -[[package]] -name = "http-range-header" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9171a2ea8a68358193d15dd5d70c1c10a2afc3e7e4c5bc92bc9f025cebd7359c" - -[[package]] -name = "httparse" -version = "1.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" - -[[package]] -name = "httpdate" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" - [[package]] name = "hydration_context" version = "0.3.0" @@ -2632,41 +2503,6 @@ dependencies = [ "throw_error", ] -[[package]] -name = "hyper" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80" -dependencies = [ - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", -] - -[[package]] -name = "hyper-util" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f66d5bd4c6f02bf0542fad85d626775bab9258cf795a4256dcaf3161114d1df" -dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "hyper", - "pin-project-lite", - "tokio", - "tower-service", -] - [[package]] name = "icu_collections" version = "1.5.0" @@ -2861,26 +2697,6 @@ dependencies = [ "hashbrown 0.16.0", ] -[[package]] -name = "inotify" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f37dccff2791ab604f9babef0ba14fbe0be30bd368dc541e2b08d07c8aa908f3" -dependencies = [ - "bitflags 2.9.0", - "inotify-sys", - "libc", -] - -[[package]] -name = "inotify-sys" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" -dependencies = [ - "libc", -] - [[package]] name = "interpolator" version = "0.5.0" @@ -2978,26 +2794,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "kqueue" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a" -dependencies = [ - "kqueue-sys", - "libc", -] - -[[package]] -name = "kqueue-sys" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" -dependencies = [ - "bitflags 1.3.2", - "libc", -] - [[package]] name = "kstring" version = "2.0.2" @@ -3194,7 +2990,7 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.9.0", + "bitflags", "libc", "redox_syscall", ] @@ -3338,12 +3134,6 @@ dependencies = [ "regex-automata", ] -[[package]] -name = "matchit" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" - [[package]] name = "maybe-async" version = "0.2.10" @@ -3355,37 +3145,6 @@ dependencies = [ "syn", ] -[[package]] -name = "mdbook" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9023c700677d66b6f42113e2d032d7deb05c21ceb9843c06e58f7f1f6b72d219" -dependencies = [ - "anyhow", - "axum", - "clap", - "clap_complete", - "futures-util", - "ignore", - "mdbook-core", - "mdbook-driver", - "mdbook-html", - "mdbook-markdown", - "mdbook-preprocessor", - "mdbook-renderer", - "mdbook-summary", - "notify", - "notify-debouncer-mini", - "opener", - "pathdiff", - "tokio", - "toml", - "tower-http", - "tracing", - "tracing-subscriber", - "walkdir", -] - [[package]] name = "mdbook-core" version = "0.5.0" @@ -3432,7 +3191,6 @@ checksum = "4ab6bfb7ad2090dc3936ed8fff02844563deab40be7a4307069f6fd2dfc88b62" dependencies = [ "anyhow", "ego-tree", - "elasticlunr-rs", "font-awesome-as-a-crate", "handlebars", "hex", @@ -3516,8 +3274,9 @@ dependencies = [ "clap", "env_logger", "log", - "mdbook", + "mdbook-driver", "mdbook-plugin-utils", + "mdbook-preprocessor", "pulldown-cmark", "semver", "serde", @@ -3537,8 +3296,11 @@ dependencies = [ "html_parser", "htmlentity", "log", - "mdbook", + "mdbook-core", + "mdbook-driver", "mdbook-plugin-utils", + "mdbook-preprocessor", + "mdbook-renderer", "peekread", "pulldown-cmark", "semver", @@ -3562,22 +3324,6 @@ dependencies = [ "libc", ] -[[package]] -name = "mime" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" - -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "minimal-lexical" version = "0.2.1" @@ -3593,18 +3339,6 @@ dependencies = [ "adler2", ] -[[package]] -name = "mio" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd" -dependencies = [ - "libc", - "log", - "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.52.0", -] - [[package]] name = "miow" version = "0.6.0" @@ -3645,42 +3379,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "notify" -version = "8.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d3d07927151ff8575b7087f245456e549fea62edf0ec4e565a5ee50c8402bc3" -dependencies = [ - "bitflags 2.9.0", - "fsevent-sys", - "inotify", - "kqueue", - "libc", - "log", - "mio", - "notify-types", - "walkdir", - "windows-sys 0.60.2", -] - -[[package]] -name = "notify-debouncer-mini" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17849edfaabd9a5fef1c606d99cfc615a8e99f7ac4366406d86c7942a3184cf2" -dependencies = [ - "log", - "notify", - "notify-types", - "tempfile", -] - -[[package]] -name = "notify-types" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e0826a989adedc2a244799e823aece04662b66609d96af8dff7ac6df9a8925d" - [[package]] name = "nu-ansi-term" version = "0.50.3" @@ -3763,7 +3461,7 @@ version = "0.10.73" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8" dependencies = [ - "bitflags 2.9.0", + "bitflags", "cfg-if", "foreign-types", "libc", @@ -4213,7 +3911,7 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e8bbe1a966bd2f362681a44f6edce3c2310ac21e4d5067a6e7ec396297a6ea0" dependencies = [ - "bitflags 2.9.0", + "bitflags", "getopts", "memchr", "pulldown-cmark-escape", @@ -4387,7 +4085,7 @@ version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1" dependencies = [ - "bitflags 2.9.0", + "bitflags", ] [[package]] @@ -4461,7 +4159,7 @@ version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "165ca6e57b20e1351573e3729b958bc62f0e48025386970b6e4d29e7a7e71f3f" dependencies = [ - "bitflags 2.9.0", + "bitflags", "fallible-iterator", "fallible-streaming-iterator", "hashlink", @@ -4508,7 +4206,7 @@ version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8" dependencies = [ - "bitflags 2.9.0", + "bitflags", "errno", "libc", "linux-raw-sys", @@ -4571,7 +4269,7 @@ version = "3.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b3297343eaf830f66ede390ea39da1d462b6b0c1b000f420d0a83f898bbbe6ef" dependencies = [ - "bitflags 2.9.0", + "bitflags", "core-foundation", "core-foundation-sys", "libc", @@ -4694,16 +4392,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "serde_path_to_error" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59fab13f937fa393d08645bf3a84bdfe86e296747b506ada67bb15f10f218b2a" -dependencies = [ - "itoa", - "serde", -] - [[package]] name = "serde_qs" version = "0.15.0" @@ -4724,18 +4412,6 @@ dependencies = [ "serde_core", ] -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - [[package]] name = "server_fn" version = "0.8.8" @@ -5007,12 +4683,6 @@ dependencies = [ "syn", ] -[[package]] -name = "sync_wrapper" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" - [[package]] name = "synstructure" version = "0.13.1" @@ -5239,57 +4909,6 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" -[[package]] -name = "tokio" -version = "1.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408" -dependencies = [ - "bytes", - "libc", - "mio", - "pin-project-lite", - "socket2", - "tokio-macros", - "windows-sys 0.61.2", -] - -[[package]] -name = "tokio-macros" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tokio-tungstenite" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857" -dependencies = [ - "futures-util", - "log", - "tokio", - "tungstenite", -] - -[[package]] -name = "tokio-util" -version = "0.7.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - [[package]] name = "toml" version = "0.9.8" @@ -5350,67 +4969,12 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d" -[[package]] -name = "tower" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" -dependencies = [ - "futures-core", - "futures-util", - "pin-project-lite", - "sync_wrapper", - "tokio", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-http" -version = "0.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2" -dependencies = [ - "bitflags 2.9.0", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "http-range-header", - "httpdate", - "mime", - "mime_guess", - "percent-encoding", - "pin-project-lite", - "tokio", - "tokio-util", - "tower-layer", - "tower-service", - "tracing", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - [[package]] name = "tracing" version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -5477,23 +5041,6 @@ dependencies = [ "tracing-log", ] -[[package]] -name = "tungstenite" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442" -dependencies = [ - "bytes", - "data-encoding", - "http", - "httparse", - "log", - "rand 0.9.2", - "sha1", - "thiserror 2.0.17", - "utf-8", -] - [[package]] name = "typed-builder" version = "0.21.2" @@ -5885,15 +5432,6 @@ dependencies = [ "windows-targets 0.53.3", ] -[[package]] -name = "windows-sys" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" -dependencies = [ - "windows-link 0.2.1", -] - [[package]] name = "windows-targets" version = "0.48.5" @@ -6095,7 +5633,7 @@ version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1" dependencies = [ - "bitflags 2.9.0", + "bitflags", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 0cd84fa..6f45e64 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,7 +14,10 @@ anyhow = "1.0.86" clap = { version = "4.5.8", features = ["derive"] } env_logger = "0.11.3" log = "0.4.22" -mdbook = "0.5.0" +mdbook-core = "0.5.0" +mdbook-driver = "0.5.0" +mdbook-preprocessor = "0.5.0" +mdbook-renderer = "0.5.0" pulldown-cmark = "0.13.0" semver = "1.0.23" serde = { version = "1.0.204", features = ["derive"] } diff --git a/book/book.toml b/book/book.toml index 9cb131e..0d84ac0 100644 --- a/book/book.toml +++ b/book/book.toml @@ -1,7 +1,6 @@ [book] authors = ["Daniƫlle Huisman"] language = "en" -multilingual = false src = "src" title = "mdBook Plugins" diff --git a/deny.toml b/deny.toml index 3a07201..bf1867b 100644 --- a/deny.toml +++ b/deny.toml @@ -17,6 +17,7 @@ allow = [ "BSD-2-Clause", "BSD-3-Clause", "BSL-1.0", + "CC-BY-4.0", "CC0-1.0", "ISC", "MIT", diff --git a/packages/mdbook-tabs/Cargo.toml b/packages/mdbook-tabs/Cargo.toml index c694ca7..1865547 100644 --- a/packages/mdbook-tabs/Cargo.toml +++ b/packages/mdbook-tabs/Cargo.toml @@ -14,8 +14,9 @@ anyhow.workspace = true clap.workspace = true env_logger.workspace = true log.workspace = true -mdbook.workspace = true +mdbook-driver.workspace = true mdbook-plugin-utils = { path = "../mdbook-plugin-utils", version = "0.2.1" } +mdbook-preprocessor.workspace = true pulldown-cmark.workspace = true semver.workspace = true serde.workspace = true diff --git a/packages/mdbook-tabs/src/bin/mdbook-tabs.rs b/packages/mdbook-tabs/src/bin/mdbook-tabs.rs index cf1b518..af39aac 100644 --- a/packages/mdbook-tabs/src/bin/mdbook-tabs.rs +++ b/packages/mdbook-tabs/src/bin/mdbook-tabs.rs @@ -6,10 +6,9 @@ use std::{ use anyhow::{Result, anyhow}; use clap::{Args, Parser, Subcommand}; use log::warn; -use mdbook::{ - MDBook, - preprocess::{CmdPreprocessor, Preprocessor}, -}; +use mdbook_driver::MDBook; +use mdbook_preprocessor::Preprocessor; +use mdbook_preprocessor::{MDBOOK_VERSION, parse_input}; use mdbook_tabs::TabsPreprocessor; use semver::{Version, VersionReq}; @@ -72,23 +71,23 @@ fn handle_supports( preprocessor: &dyn Preprocessor, SupportsArgs { renderer }: &SupportsArgs, ) -> Result<()> { - match preprocessor.supports_renderer(renderer) { + match preprocessor.supports_renderer(renderer)? { true => Ok(()), false => Err(anyhow!("Renderer `{renderer}` is not supported.")), } } fn handle_preprocessing(preprocessor: &dyn Preprocessor, reader: R) -> Result<()> { - let (ctx, book) = CmdPreprocessor::parse_input(reader)?; + let (ctx, book) = parse_input(reader)?; let book_version = Version::parse(&ctx.mdbook_version)?; - let version_req = VersionReq::parse(mdbook::MDBOOK_VERSION)?; + let version_req = VersionReq::parse(MDBOOK_VERSION)?; if !version_req.matches(&book_version) { warn!( "The {} plugin was built against version {} of mdbook, but we're being called from version {}", preprocessor.name(), - mdbook::MDBOOK_VERSION, + MDBOOK_VERSION, ctx.mdbook_version ); } diff --git a/packages/mdbook-tabs/src/parser/tabs.rs b/packages/mdbook-tabs/src/parser/tabs.rs index 87083be..9dcdd2a 100644 --- a/packages/mdbook-tabs/src/parser/tabs.rs +++ b/packages/mdbook-tabs/src/parser/tabs.rs @@ -2,8 +2,8 @@ use std::ops::Range; use anyhow::{Result, bail}; use log::debug; -use mdbook::book::Chapter; use mdbook_plugin_utils::markdown::parse_blocks; +use mdbook_preprocessor::book::Chapter; use pulldown_cmark::Event; use crate::config::{TabConfig, TabsConfig}; diff --git a/packages/mdbook-tabs/src/preprocessor.rs b/packages/mdbook-tabs/src/preprocessor.rs index f419a44..b504be8 100644 --- a/packages/mdbook-tabs/src/preprocessor.rs +++ b/packages/mdbook-tabs/src/preprocessor.rs @@ -1,10 +1,9 @@ use std::str; use anyhow::{Result, bail}; -use mdbook::{ - BookItem, - book::Book, - preprocess::{Preprocessor, PreprocessorContext}, +use mdbook_preprocessor::{ + Preprocessor, PreprocessorContext, + book::{Book, BookItem}, }; use crate::{parser::tabs::parse_tabs, tabs::tabs}; @@ -31,13 +30,13 @@ impl Preprocessor for TabsPreprocessor { fn run(&self, _ctx: &PreprocessorContext, book: Book) -> Result { let mut book = book.clone(); - process_items(&mut book.sections)?; + process_items(&mut book.items)?; Ok(book) } - fn supports_renderer(&self, _renderer: &str) -> bool { - true + fn supports_renderer(&self, _renderer: &str) -> Result { + Ok(true) } } diff --git a/packages/mdbook-trunk/Cargo.toml b/packages/mdbook-trunk/Cargo.toml index b3c0ff5..a6dd460 100644 --- a/packages/mdbook-trunk/Cargo.toml +++ b/packages/mdbook-trunk/Cargo.toml @@ -18,8 +18,11 @@ fs_extra = "1.3.0" html_parser = "0.7.0" htmlentity = "1.3.2" log.workspace = true -mdbook.workspace = true +mdbook-core.workspace = true +mdbook-driver.workspace = true mdbook-plugin-utils = { path = "../mdbook-plugin-utils", version = "0.2.1" } +mdbook-preprocessor.workspace = true +mdbook-renderer.workspace = true peekread = "0.1.1" pulldown-cmark.workspace = true semver.workspace = true diff --git a/packages/mdbook-trunk/src/bin/mdbook-trunk.rs b/packages/mdbook-trunk/src/bin/mdbook-trunk.rs index 372df92..398ec1d 100644 --- a/packages/mdbook-trunk/src/bin/mdbook-trunk.rs +++ b/packages/mdbook-trunk/src/bin/mdbook-trunk.rs @@ -7,11 +7,10 @@ use anyhow::{Result, anyhow}; use clap::{Args, Parser, Subcommand}; use fs_extra::dir::{CopyOptions, DirOptions, copy, get_dir_content2}; use log::warn; -use mdbook::{ - MDBook, Renderer, - preprocess::{CmdPreprocessor, Preprocessor}, - renderer::RenderContext, -}; +use mdbook_core::MDBOOK_VERSION; +use mdbook_driver::MDBook; +use mdbook_preprocessor::{Preprocessor, parse_input}; +use mdbook_renderer::{RenderContext, Renderer}; use mdbook_trunk::{TrunkPreprocessor, TrunkRenderer}; use peekread::{BufPeekReader, PeekRead}; use semver::{Version, VersionReq}; @@ -124,23 +123,23 @@ fn handle_supports( preprocessor: &dyn Preprocessor, SupportsArgs { renderer }: &SupportsArgs, ) -> Result<()> { - match preprocessor.supports_renderer(renderer) { + match preprocessor.supports_renderer(renderer)? { true => Ok(()), false => Err(anyhow!("Renderer `{renderer}` is not supported.")), } } fn handle_preprocessing(preprocessor: &dyn Preprocessor, reader: R) -> Result<()> { - let (ctx, book) = CmdPreprocessor::parse_input(reader)?; + let (ctx, book) = parse_input(reader)?; let book_version = Version::parse(&ctx.mdbook_version)?; - let version_req = VersionReq::parse(mdbook::MDBOOK_VERSION)?; + let version_req = VersionReq::parse(MDBOOK_VERSION)?; if !version_req.matches(&book_version) { warn!( "The {} plugin was built against version {} of mdbook, but we're being called from version {}", preprocessor.name(), - mdbook::MDBOOK_VERSION, + MDBOOK_VERSION, ctx.mdbook_version ); } @@ -155,13 +154,13 @@ fn handle_renderer(renderer: &dyn Renderer, reader: R) -> Result<()> { let ctx = RenderContext::from_json(reader).unwrap(); let book_version = Version::parse(&ctx.version)?; - let version_req = VersionReq::parse(mdbook::MDBOOK_VERSION)?; + let version_req = VersionReq::parse(MDBOOK_VERSION)?; if !version_req.matches(&book_version) { warn!( "The {} plugin was built against version {} of mdbook, but we're being called from version {}", renderer.name(), - mdbook::MDBOOK_VERSION, + MDBOOK_VERSION, ctx.version ); } diff --git a/packages/mdbook-trunk/src/parser/definition.rs b/packages/mdbook-trunk/src/parser/definition.rs index a443ec3..0603696 100644 --- a/packages/mdbook-trunk/src/parser/definition.rs +++ b/packages/mdbook-trunk/src/parser/definition.rs @@ -2,7 +2,7 @@ use std::ops::Range; use anyhow::Result; use log::debug; -use mdbook::book::Chapter; +use mdbook_core::book::Chapter; use mdbook_plugin_utils::markdown::parse_code_blocks; use crate::config::Config; diff --git a/packages/mdbook-trunk/src/parser/iframe.rs b/packages/mdbook-trunk/src/parser/iframe.rs index fad801e..a936950 100644 --- a/packages/mdbook-trunk/src/parser/iframe.rs +++ b/packages/mdbook-trunk/src/parser/iframe.rs @@ -4,7 +4,7 @@ use anyhow::Result; use html_parser::{Dom, Node}; use htmlentity::entity::{ICodedDataTrait, decode}; use log::debug; -use mdbook::book::Chapter; +use mdbook_core::book::Chapter; use mdbook_plugin_utils::markdown::parse_blocks; use pulldown_cmark::{Event, TagEnd}; diff --git a/packages/mdbook-trunk/src/preprocessor.rs b/packages/mdbook-trunk/src/preprocessor.rs index 9dca3d2..a309ccd 100644 --- a/packages/mdbook-trunk/src/preprocessor.rs +++ b/packages/mdbook-trunk/src/preprocessor.rs @@ -2,10 +2,9 @@ use std::{env, str}; use anyhow::Result; use cargo::{GlobalContext, core::Workspace, util::important_paths::find_root_manifest_for_wd}; -use mdbook::{ - BookItem, - book::Book, - preprocess::{Preprocessor, PreprocessorContext}, +use mdbook_preprocessor::{ + Preprocessor, PreprocessorContext, + book::{Book, BookItem}, }; use crate::{parser::definition::parse_definitions, trunk::trunk}; @@ -35,13 +34,13 @@ impl Preprocessor for TrunkPreprocessor { let gctx = GlobalContext::default()?; let workspace = Workspace::new(&find_root_manifest_for_wd(&env::current_dir()?)?, &gctx)?; - process_items(&workspace, &mut book.sections)?; + process_items(&workspace, &mut book.items)?; Ok(book) } - fn supports_renderer(&self, _renderer: &str) -> bool { - true + fn supports_renderer(&self, _renderer: &str) -> Result { + Ok(true) } } diff --git a/packages/mdbook-trunk/src/renderer.rs b/packages/mdbook-trunk/src/renderer.rs index 26d545f..73eed61 100644 --- a/packages/mdbook-trunk/src/renderer.rs +++ b/packages/mdbook-trunk/src/renderer.rs @@ -2,7 +2,7 @@ use std::{collections::HashSet, env}; use anyhow::Result; use cargo::{GlobalContext, core::Workspace, util::important_paths::find_root_manifest_for_wd}; -use mdbook::{BookItem, Renderer, renderer::RenderContext}; +use mdbook_renderer::{RenderContext, Renderer, book::BookItem}; use crate::{config::BuildConfig, parser::iframe::parse_iframes, trunk::build}; @@ -29,7 +29,7 @@ impl Renderer for TrunkRenderer { let gctx = GlobalContext::default()?; let workspace = Workspace::new(&find_root_manifest_for_wd(&env::current_dir()?)?, &gctx)?; - let builds = process_items(&ctx.book.sections)?; + let builds = process_items(&ctx.book.items)?; // let mut handles = vec![]; for build_config in builds {