From 5f21b891e2227ef9f9c844975ed13035a9f1a2f0 Mon Sep 17 00:00:00 2001 From: Sam Wilson Date: Fri, 31 Jan 2025 15:33:54 -0500 Subject: [PATCH] Update deps; pretty diffs --- Cargo.lock | 851 ++++++++++-------- Cargo.toml | 15 +- eipw-lint-js/Cargo.toml | 9 +- eipw-lint-js/tests/main.rs | 18 +- eipw-lint/Cargo.toml | 13 +- eipw-lint/src/lib.rs | 12 +- eipw-lint/src/tree.rs | 32 +- eipw-lint/tests/eipv.rs | 1 + .../eipv/markdown-json-cite/expected.txt | 16 +- .../preamble-missing-required/expected.txt | 5 +- .../expected.txt | 5 +- .../expected.txt | 5 +- .../tests/lint_markdown_heading_first.rs | 1 + .../tests/lint_markdown_headings_space.rs | 1 + .../tests/lint_markdown_html_comments.rs | 1 + eipw-lint/tests/lint_markdown_json_schema.rs | 1 + eipw-lint/tests/lint_markdown_link_first.rs | 1 + eipw-lint/tests/lint_markdown_no_backticks.rs | 1 + eipw-lint/tests/lint_markdown_regex.rs | 1 + .../tests/lint_markdown_relative_links.rs | 1 + .../tests/lint_markdown_section_order.rs | 1 + .../tests/lint_markdown_section_required.rs | 1 + eipw-lint/tests/lint_preamble_author.rs | 1 + eipw-lint/tests/lint_preamble_date.rs | 1 + eipw-lint/tests/lint_preamble_file_name.rs | 1 + eipw-lint/tests/lint_preamble_length.rs | 1 + eipw-lint/tests/lint_preamble_list.rs | 18 +- .../tests/lint_preamble_no_duplicates.rs | 1 + eipw-lint/tests/lint_preamble_one_of.rs | 1 + eipw-lint/tests/lint_preamble_order.rs | 1 + eipw-lint/tests/lint_preamble_regex.rs | 1 + .../tests/lint_preamble_require_reference.rs | 16 +- eipw-lint/tests/lint_preamble_required.rs | 1 + .../tests/lint_preamble_required_if_eq.rs | 1 + eipw-lint/tests/lint_preamble_trim.rs | 1 + eipw-lint/tests/lint_preamble_uint.rs | 1 + eipw-lint/tests/lint_preamble_uint_list.rs | 11 +- eipw-lint/tests/lint_preamble_url.rs | 1 + eipw-lint/tests/warning.rs | 1 + eipw-snippets/Cargo.toml | 2 +- 40 files changed, 621 insertions(+), 432 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2b5d7d4c..f31ce81b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -42,9 +42,9 @@ dependencies = [ [[package]] name = "annotate-snippets" -version = "0.11.4" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e35ed54e5ea7997c14ed4c70ba043478db1112e98263b3b035907aa197d991" +checksum = "710e8eae58854cdc1790fcb56cca04d712a17be849eeb81da2a724bf4bae2bc4" dependencies = [ "anstyle", "unicode-width", @@ -52,9 +52,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526" +checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" dependencies = [ "anstyle", "anstyle-parse", @@ -67,44 +67,39 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.8" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1" +checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" [[package]] name = "anstyle-parse" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb" +checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.1" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a" +checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" dependencies = [ - "windows-sys 0.52.0", + "windows-sys", ] [[package]] name = "anstyle-wincon" -version = "3.0.4" +version = "3.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8" +checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "once_cell", + "windows-sys", ] -[[package]] -name = "anyhow" -version = "1.0.89" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" - [[package]] name = "assert_matches" version = "1.5.0" @@ -140,24 +135,24 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] name = "bit-set" -version = "0.5.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" dependencies = [ "bit-vec", ] [[package]] name = "bit-vec" -version = "0.6.3" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitflags" -version = "2.6.0" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" [[package]] name = "borrow-or-share" @@ -167,9 +162,9 @@ checksum = "3eeab4423108c5d7c744f4d234de88d18d636100093ae04caf4825134b9c3a32" [[package]] name = "bumpalo" -version = "3.16.0" +version = "3.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" [[package]] name = "bytecount" @@ -185,19 +180,18 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "caseless" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "808dab3318747be122cb31d36de18d4d1c81277a76f8332a02b81a3d73463d7f" +checksum = "8b6fd507454086c8edfd769ca6ada439193cdb209c7681712ef6275cccbfe5d8" dependencies = [ - "regex", "unicode-normalization", ] [[package]] name = "cc" -version = "1.1.29" +version = "1.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58e804ac3194a48bb129643eb1d62fcc20d18c6b8c181704489353d13120bcd1" +checksum = "13208fcbb66eaeffe09b99fffbe1af420f00a7b35aa99ad683dfc1aa76145229" dependencies = [ "shlex", ] @@ -210,18 +204,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" -version = "0.4.38" +version = "0.4.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" +checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825" dependencies = [ "num-traits", ] [[package]] name = "clap" -version = "4.5.20" +version = "4.5.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8" +checksum = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796" dependencies = [ "clap_builder", "clap_derive", @@ -229,9 +223,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.20" +version = "4.5.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54" +checksum = "1b26884eb4b57140e4d2d93652abfa49498b938b3c9179f9fc487b0acc3edad7" dependencies = [ "anstream", "anstyle", @@ -241,9 +235,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.18" +version = "4.5.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab" +checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c" dependencies = [ "heck", "proc-macro2", @@ -253,28 +247,25 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97" +checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" [[package]] name = "colorchoice" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0" +checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" [[package]] name = "comrak" -version = "0.29.0" +version = "0.35.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c32ff8b21372fab0e9ecc4e42536055702dc5faa418362bffd1544f9d12637" +checksum = "52602e10393cfaaf8accaf707f2da743dc22cbe700a343ff8dbc9e5e04bc6b74" dependencies = [ "caseless", - "derive_builder", "entities", "memchr", - "once_cell", - "regex", "slug", "typed-arena", "unicode_categories", @@ -292,14 +283,14 @@ dependencies = [ [[package]] name = "cssparser" -version = "0.31.2" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b3df4f93e5fbbe73ec01ec8d3f68bba73107993a5b1e7519273c32db9b0d5be" +checksum = "b7c66d1cd8ed61bf80b38432613a7a2f09401ab8d0501110655f8b341484a3e3" dependencies = [ "cssparser-macros", "dtoa-short", "itoa", - "phf 0.11.2", + "phf", "smallvec", ] @@ -314,97 +305,39 @@ dependencies = [ ] [[package]] -name = "darling" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" -dependencies = [ - "darling_core", - "darling_macro", -] - -[[package]] -name = "darling_core" -version = "0.20.10" +name = "derive_more" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ - "fnv", - "ident_case", "proc-macro2", "quote", - "strsim", - "syn", -] - -[[package]] -name = "darling_macro" -version = "0.20.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" -dependencies = [ - "darling_core", - "quote", "syn", ] [[package]] -name = "deranged" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4" -dependencies = [ - "powerfmt", -] - -[[package]] -name = "derive_builder" -version = "0.20.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" -dependencies = [ - "derive_builder_macro", -] - -[[package]] -name = "derive_builder_core" -version = "0.20.2" +name = "deunicode" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" -dependencies = [ - "darling", - "proc-macro2", - "quote", - "syn", -] +checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00" [[package]] -name = "derive_builder_macro" -version = "0.20.2" +name = "diff" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" -dependencies = [ - "derive_builder_core", - "syn", -] +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" [[package]] -name = "derive_more" -version = "0.99.18" +name = "displaydoc" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "deunicode" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "339544cc9e2c4dc3fc7149fd630c5f22263a4fdf18a98afd0075784968b5cf00" - [[package]] name = "dtoa" version = "1.0.9" @@ -434,9 +367,9 @@ dependencies = [ [[package]] name = "ego-tree" -version = "0.6.3" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12a0bb14ac04a9fcf170d0bbbef949b44cc492f4452bd20c095636956f653642" +checksum = "b2972feb8dffe7bc8c5463b1dacda1b0dfbed3710e50f977d965429692d74cd8" [[package]] name = "eipw" @@ -466,6 +399,7 @@ dependencies = [ "eipw-snippets", "formatx", "jsonschema", + "pretty_assertions", "regex", "scraper", "serde", @@ -485,6 +419,7 @@ dependencies = [ "eipw-snippets", "getrandom", "js-sys", + "pretty_assertions", "serde", "serde-wasm-bindgen", "serde_json", @@ -512,6 +447,15 @@ dependencies = [ "serde_json", ] +[[package]] +name = "email_address" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e079f19b08ca6239f47f8ba8509c11cf3ea30095831f7fed61441475edd8c449" +dependencies = [ + "serde", +] + [[package]] name = "entities" version = "1.0.1" @@ -546,9 +490,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "fancy-regex" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "531e46835a22af56d1e3b66f04844bed63158bc094a628bec1d321d9b4c44bf2" +checksum = "6e24cb5a94bcae1e5408b0effca5cd7172ea3c5755049c5f3af4cd283a165298" dependencies = [ "bit-set", "regex-automata", @@ -557,21 +501,15 @@ dependencies = [ [[package]] name = "fluent-uri" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7bd399b64ddd63a83cf40512c96007dafe9ac26cfc8c89c820a247c6f7d2376" +checksum = "1918b65d96df47d3591bed19c5cca17e3fa5d0707318e4b5ef2eae01764df7e5" dependencies = [ "borrow-or-share", "ref-cast", "serde", ] -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - [[package]] name = "form_urlencoded" version = "1.2.1" @@ -583,9 +521,9 @@ dependencies = [ [[package]] name = "formatx" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db0f0c49aba98a3b2578315766960bd242885ff672fd62610c5557cd6c6efe03" +checksum = "fa6f3b9014e23925937fbf4d05f27a6f4efe42545f98690b94f193bdb3f1959e" [[package]] name = "fraction" @@ -649,9 +587,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "html5ever" -version = "0.27.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c13771afe0e6e846f1e67d038d4cb29998a6779f93c809212e4e9c32efd244d4" +checksum = "2e15626aaf9c351bc696217cbe29cb9b5e86c43f8a46b5e2f5c6c5cf7cb904ce" dependencies = [ "log", "mac", @@ -662,26 +600,149 @@ dependencies = [ ] [[package]] -name = "ident_case" -version = "1.0.1" +name = "icu_collections" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_locid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637" +dependencies = [ + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", +] + +[[package]] +name = "icu_locid_transform" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_locid_transform_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_locid_transform_data" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" +checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e" + +[[package]] +name = "icu_normalizer" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "utf16_iter", + "utf8_iter", + "write16", + "zerovec", +] + +[[package]] +name = "icu_normalizer_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516" + +[[package]] +name = "icu_properties" +version = "1.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5" +dependencies = [ + "displaydoc", + "icu_collections", + "icu_locid_transform", + "icu_properties_data", + "icu_provider", + "tinystr", + "zerovec", +] + +[[package]] +name = "icu_properties_data" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569" + +[[package]] +name = "icu_provider" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9" +dependencies = [ + "displaydoc", + "icu_locid", + "icu_provider_macros", + "stable_deref_trait", + "tinystr", + "writeable", + "yoke", + "zerofrom", + "zerovec", +] + +[[package]] +name = "icu_provider_macros" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] [[package]] name = "idna" -version = "0.5.0" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" +checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ - "unicode-bidi", - "unicode-normalization", + "idna_adapter", + "smallvec", + "utf8_iter", +] + +[[package]] +name = "idna_adapter" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71" +dependencies = [ + "icu_normalizer", + "icu_properties", ] [[package]] name = "indexmap" -version = "2.6.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da" +checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", "hashbrown", @@ -693,54 +754,43 @@ version = "1.70.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf" -[[package]] -name = "iso8601" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "924e5d73ea28f59011fec52a0d12185d496a9b075d360657aed2a5707f701153" -dependencies = [ - "nom", -] - [[package]] name = "itoa" -version = "1.0.11" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" +checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "js-sys" -version = "0.3.72" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9" +checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f" dependencies = [ + "once_cell", "wasm-bindgen", ] [[package]] name = "jsonschema" -version = "0.21.0" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "507489ad0bb386bda1ff52086877dc5847cc3730b9da5c5a4af75a9e4991eb30" +checksum = "4b8f66fe41fa46a5c83ed1c717b7e0b4635988f427083108c8cf0a882cc13441" dependencies = [ "ahash", - "anyhow", "base64", "bytecount", + "email_address", "fancy-regex", "fraction", - "getrandom", - "iso8601", + "idna", "itoa", "num-cmp", "once_cell", "percent-encoding", "referencing", - "regex", + "regex-syntax", "serde", "serde_json", - "time", - "url", "uuid-simd", ] @@ -752,9 +802,15 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.159" +version = "0.2.169" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" + +[[package]] +name = "litemap" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" +checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "lock_api" @@ -768,9 +824,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "mac" @@ -780,13 +836,13 @@ checksum = "c41e0c4fef86961ac6d6f8a82609f55f31b05e4fce149ac5710e439df7619ba4" [[package]] name = "markup5ever" -version = "0.12.1" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ce3abbeba692c8b8441d036ef91aea6df8da2c6b6e21c7e14d3c18e526be45" +checksum = "82c88c6129bd24319e62a0359cb6b958fa7e8be6e19bb1663bc396b90883aca5" dependencies = [ "log", - "phf 0.11.2", - "phf_codegen 0.11.2", + "phf", + "phf_codegen", "string_cache", "string_cache_codegen", "tendril", @@ -800,25 +856,19 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "minicov" -version = "0.3.5" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c71e683cd655513b99affab7d317deb690528255a0d5f717f1024093c12b169" +checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b" dependencies = [ "cc", "walkdir", ] -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "miniz_oxide" -version = "0.8.0" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" +checksum = "b8402cab7aefae129c6977bb0ff1b8fd9a04eb5b51efc50a70bea51cda0c7924" dependencies = [ "adler2", ] @@ -829,16 +879,6 @@ version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "num" version = "0.4.3" @@ -878,12 +918,6 @@ dependencies = [ "num-traits", ] -[[package]] -name = "num-conv" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9" - [[package]] name = "num-integer" version = "0.1.46" @@ -926,9 +960,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.5" +version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e" +checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "memchr", ] @@ -941,9 +975,9 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "outref" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" +checksum = "1a80800c0488c3a21695ea981a54918fbb37abf04f4d0720c453632255e2ff0e" [[package]] name = "parking_lot" @@ -976,41 +1010,22 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "phf" -version = "0.10.1" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" -dependencies = [ - "phf_shared 0.10.0", -] - -[[package]] -name = "phf" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078" dependencies = [ "phf_macros", - "phf_shared 0.11.2", + "phf_shared 0.11.3", ] [[package]] name = "phf_codegen" -version = "0.10.0" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1c3a8bc4dd4e5cfce29b44ffc14bedd2ee294559a294e2a4d4c9e9a6a13cd" +checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a" dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", -] - -[[package]] -name = "phf_codegen" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8d39688d359e6b34654d328e262234662d16cc0f60ec8dcbe5e718709342a5a" -dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", + "phf_generator 0.11.3", + "phf_shared 0.11.3", ] [[package]] @@ -1025,22 +1040,22 @@ dependencies = [ [[package]] name = "phf_generator" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d" dependencies = [ - "phf_shared 0.11.2", + "phf_shared 0.11.3", "rand", ] [[package]] name = "phf_macros" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" +checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216" dependencies = [ - "phf_generator 0.11.2", - "phf_shared 0.11.2", + "phf_generator 0.11.3", + "phf_shared 0.11.3", "proc-macro2", "quote", "syn", @@ -1052,29 +1067,23 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096" dependencies = [ - "siphasher", + "siphasher 0.3.11", ] [[package]] name = "phf_shared" -version = "0.11.2" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5" dependencies = [ - "siphasher", + "siphasher 1.0.1", ] [[package]] name = "pin-project-lite" -version = "0.2.14" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" - -[[package]] -name = "powerfmt" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "ppv-lite86" @@ -1091,20 +1100,30 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" +[[package]] +name = "pretty_assertions" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" +dependencies = [ + "diff", + "yansi", +] + [[package]] name = "proc-macro2" -version = "1.0.87" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" +checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.37" +version = "1.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" +checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" dependencies = [ "proc-macro2", ] @@ -1141,9 +1160,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.7" +version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" +checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834" dependencies = [ "bitflags", ] @@ -1170,9 +1189,9 @@ dependencies = [ [[package]] name = "referencing" -version = "0.21.0" +version = "0.28.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc5ad87f9bf7d32f48f98d606085fe5eae4404ad1cc1025c50111b80f53ea029" +checksum = "d0dcb5ab28989ad7c91eb1b9531a37a1a137cc69a0499aee4117cae4a107c464" dependencies = [ "ahash", "fluent-uri", @@ -1183,9 +1202,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.11.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", @@ -1195,9 +1214,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.8" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -1216,11 +1235,17 @@ version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +[[package]] +name = "rustversion" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" + [[package]] name = "ryu" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" +checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" [[package]] name = "same-file" @@ -1231,12 +1256,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "scoped-tls" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1cf6437eb19a8f4a6cc0f7dca544973b0b78843adbfeb3683d1a94a0024a294" - [[package]] name = "scopeguard" version = "1.2.0" @@ -1245,24 +1264,23 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scraper" -version = "0.20.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b90460b31bfe1fc07be8262e42c665ad97118d4585869de9345a84d501a9eaf0" +checksum = "cc3d051b884f40e309de6c149734eab57aa8cc1347992710dc80bcc1c2194c15" dependencies = [ - "ahash", "cssparser", "ego-tree", "html5ever", - "once_cell", + "precomputed-hash", "selectors", "tendril", ] [[package]] name = "selectors" -version = "0.25.0" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4eb30575f3638fc8f6815f448d50cb1a2e255b0897985c8c59f4d37b72a07b06" +checksum = "fd568a4c9bb598e291a08244a5c1f5a8a6650bee243b5b0f8dbb3d9cc1d87fe8" dependencies = [ "bitflags", "cssparser", @@ -1270,8 +1288,8 @@ dependencies = [ "fxhash", "log", "new_debug_unreachable", - "phf 0.10.1", - "phf_codegen 0.10.0", + "phf", + "phf_codegen", "precomputed-hash", "servo_arc", "smallvec", @@ -1279,9 +1297,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.210" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] @@ -1299,9 +1317,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.210" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", @@ -1310,9 +1328,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.128" +version = "1.0.138" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8" +checksum = "d434192e7da787e94a6ea7e9670b26a036d0ca41e0b7efb2676dd32bae872949" dependencies = [ "itoa", "memchr", @@ -1331,9 +1349,9 @@ dependencies = [ [[package]] name = "servo_arc" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d036d71a959e00c77a63538b90a6c2390969f9772b096ea837205c6bd0491a44" +checksum = "ae65c4249478a2647db249fb43e23cec56a2c8974a427e7bd8cb5a1d0964921a" dependencies = [ "stable_deref_trait", ] @@ -1350,6 +1368,12 @@ version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" +[[package]] +name = "siphasher" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" + [[package]] name = "slug" version = "0.1.6" @@ -1427,20 +1451,31 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" [[package]] name = "syn" -version = "2.0.79" +version = "2.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" +checksum = "d5d0adab1ae378d7f53bdebc67a39f1f151407ef230f0ce2883572f5d8985c80" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "synstructure" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "sysexits" -version = "0.8.2" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5649c51a0a23b49261cc66a328925546beaf86d7c9af801b3993732deccec7a" +checksum = "3a70e00b0ea6c3e7154dfc48fee004bf61bdc154fd99b7e17c05318503b9660b" [[package]] name = "tendril" @@ -1455,18 +1490,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.64" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.64" +version = "2.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" dependencies = [ "proc-macro2", "quote", @@ -1474,40 +1509,20 @@ dependencies = [ ] [[package]] -name = "time" -version = "0.3.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" -dependencies = [ - "deranged", - "num-conv", - "powerfmt", - "serde", - "time-core", - "time-macros", -] - -[[package]] -name = "time-core" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" - -[[package]] -name = "time-macros" -version = "0.2.18" +name = "tinystr" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" +checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f" dependencies = [ - "num-conv", - "time-core", + "displaydoc", + "zerovec", ] [[package]] name = "tinyvec" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" +checksum = "022db8904dfa342efe721985167e9fcd16c29b226db4397ed752a761cfce81e8" dependencies = [ "tinyvec_macros", ] @@ -1520,9 +1535,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.40.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "pin-project-lite", @@ -1531,9 +1546,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", @@ -1563,9 +1578,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.22" +version = "0.22.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" +checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee" dependencies = [ "indexmap", "serde", @@ -1580,17 +1595,11 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6af6ae20167a9ece4bcb41af5b80f8a1f1df981f6391189ce00fd257af04126a" -[[package]] -name = "unicode-bidi" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" - [[package]] name = "unicode-ident" -version = "1.0.13" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "unicode-normalization" @@ -1603,9 +1612,9 @@ dependencies = [ [[package]] name = "unicode-width" -version = "0.1.14" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd" [[package]] name = "unicode_categories" @@ -1615,9 +1624,9 @@ checksum = "39ec24b3121d976906ece63c9daad25b85969647682eee313cb5779fdd69e14e" [[package]] name = "url" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" +checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60" dependencies = [ "form_urlencoded", "idna", @@ -1630,6 +1639,18 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +[[package]] +name = "utf16_iter" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246" + +[[package]] +name = "utf8_iter" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" + [[package]] name = "utf8parse" version = "0.2.2" @@ -1638,9 +1659,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" -version = "1.10.0" +version = "1.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" +checksum = "b3758f5e68192bb96cc8f9b7e2c2cfdabb435499a28499a42f8f984092adad4b" [[package]] name = "uuid-simd" @@ -1683,12 +1704,13 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "serde", "serde_json", "wasm-bindgen-macro", @@ -1696,13 +1718,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn", @@ -1711,21 +1732,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.45" +version = "0.4.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7ec4f8827a71586374db3e87abdb5a2bb3a15afed140221307c3ec06b1f63b" +checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61" dependencies = [ "cfg-if", "js-sys", + "once_cell", "wasm-bindgen", "web-sys", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1733,9 +1755,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -1746,20 +1768,21 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "wasm-bindgen-test" -version = "0.3.45" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d381749acb0943d357dcbd8f0b100640679883fcdeeef04def49daf8d33a5426" +checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3" dependencies = [ - "console_error_panic_hook", "js-sys", "minicov", - "scoped-tls", "wasm-bindgen", "wasm-bindgen-futures", "wasm-bindgen-test-macro", @@ -1767,9 +1790,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-test-macro" -version = "0.3.45" +version = "0.3.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c97b2ef2c8d627381e51c071c2ab328eac606d3f69dd82bcbca20a9e389d95f0" +checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b" dependencies = [ "proc-macro2", "quote", @@ -1778,9 +1801,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.72" +version = "0.3.77" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6488b90108c040df0fe62fa815cbdee25124641df01814dd7282749234c6112" +checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2" dependencies = [ "js-sys", "wasm-bindgen", @@ -1792,16 +1815,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets", + "windows-sys", ] [[package]] @@ -1879,13 +1893,55 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.20" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" +checksum = "7e49d2d35d3fad69b39b94139037ecfb4f359f08958b9c11e7315ce770462419" dependencies = [ "memchr", ] +[[package]] +name = "write16" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936" + +[[package]] +name = "writeable" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51" + +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + +[[package]] +name = "yoke" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40" +dependencies = [ + "serde", + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + [[package]] name = "zerocopy" version = "0.7.35" @@ -1906,3 +1962,46 @@ dependencies = [ "quote", "syn", ] + +[[package]] +name = "zerofrom" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cff3ee08c995dee1859d998dea82f7374f2826091dd9cd47def953cae446cd2e" +dependencies = [ + "zerofrom-derive", +] + +[[package]] +name = "zerofrom-derive" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerovec" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.10.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] diff --git a/Cargo.toml b/Cargo.toml index ee2d7006..1625f8bd 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,14 +12,15 @@ rust-version = "1.80" eipw-snippets = { path = "eipw-snippets", version = "0.2.0-dev" } eipw-lint = { path = "eipw-lint", version = "0.10.0-dev" } eipw-preamble = { path = "eipw-preamble", version = "0.3.0-dev" } -tokio = "1.40.0" -serde_json = "1.0.108" +tokio = "1.43.0" +serde_json = "1.0.138" toml = "0.8.19" -serde = "1.0.164" +serde = "1.0.217" getrandom = "0.2.15" -regex = "1.11.0" +regex = "1.11.1" snafu = "0.8.5" assert_matches = "1.5.0" +pretty_assertions = "1.4.1" [package] name = "eipw" @@ -40,9 +41,9 @@ serde_json.workspace = true toml.workspace = true serde = { workspace = true, features = [ "derive" ] } -sysexits = "0.8.2" -clap = { version = "4.5.18", features = [ "derive", "cargo" ] } -thiserror = "1.0.64" +sysexits = "0.8.5" +clap = { version = "4.5.27", features = [ "derive", "cargo" ] } +thiserror = "2.0.11" [target.'cfg(target_arch = "wasm32")'.dependencies] tokio = { workspace = true, features = [ "macros", "rt" ] } diff --git a/eipw-lint-js/Cargo.toml b/eipw-lint-js/Cargo.toml index 6f9f81a9..d931ceec 100644 --- a/eipw-lint-js/Cargo.toml +++ b/eipw-lint-js/Cargo.toml @@ -24,11 +24,12 @@ serde_json.workspace = true serde = { workspace = true, features = [ "derive" ] } getrandom = { workspace = true, features = [ "js" ] } -wasm-bindgen = { version = "0.2.93", features = [ "serde-serialize" ] } +wasm-bindgen = { version = "0.2.100", features = [ "serde-serialize" ] } serde-wasm-bindgen = "0.6.5" -wasm-bindgen-futures = "0.4.43" +wasm-bindgen-futures = "0.4.50" console_error_panic_hook = { version = "0.1.7", optional = true } -js-sys = "0.3.70" +js-sys = "0.3.77" [dev-dependencies] -wasm-bindgen-test = "0.3.43" +pretty_assertions.workspace = true +wasm-bindgen-test = "0.3.50" diff --git a/eipw-lint-js/tests/main.rs b/eipw-lint-js/tests/main.rs index 20eeea06..170f7f91 100644 --- a/eipw-lint-js/tests/main.rs +++ b/eipw-lint-js/tests/main.rs @@ -9,6 +9,8 @@ use eipw_lint_js::{format, lint}; use js_sys::Object; +use pretty_assertions::assert_eq; + use serde::Serialize; use serde_json::json; @@ -114,7 +116,21 @@ async fn lint_json_schema() { "title": "see https://ethereum.github.io/eipw/markdown-json-cite/" } ], - "formatted": "error[markdown-json-cite]: code block of type `csl-json` does not conform to required schema\n --> tests/eips/eip-2000.md:42:1\n |\n42 | // ```csl-json\n43 | || {\n44 | || \"type\": \"article\",\n45 | || \"id\": \"1\",\n46 | || \"URL\": \"3\"\n | ||__________________^ \"3\" is not a \"uri\"\n | ||__________________^ \"DOI\" is a required property\n |\n = help: see https://github.com/ethereum/eipw/blob/master/eipw-lint/src/lints/markdown/json_schema/citation.json\n = help: see https://ethereum.github.io/eipw/markdown-json-cite/", + "formatted": r#"error[markdown-json-cite]: code block of type `csl-json` does not conform to required schema + --> tests/eips/eip-2000.md:42:1 + | +42 | / ```csl-json +43 | | { +44 | | "type": "article", +45 | | "id": "1", +46 | | "URL": "3" + | | ^ + | |__________________| + | "3" is not a "uri" + | "DOI" is a required property + | + = help: see https://github.com/ethereum/eipw/blob/master/eipw-lint/src/lints/markdown/json_schema/citation.json + = help: see https://ethereum.github.io/eipw/markdown-json-cite/"#, "id": "markdown-json-cite", "level": "Error", "snippets": [ diff --git a/eipw-lint/Cargo.toml b/eipw-lint/Cargo.toml index f3625345..7f280d6f 100644 --- a/eipw-lint/Cargo.toml +++ b/eipw-lint/Cargo.toml @@ -18,13 +18,13 @@ regex.workspace = true serde = { workspace = true, features = [ "derive" ] } tokio = { optional = true, workspace = true, features = [ "macros" ] } -comrak = { version = "0.29.0", default-features = false } -url = "2.5.2" -chrono = { version = "0.4.38", default-features = false } +comrak = { version = "0.35.0", default-features = false } +url = "2.5.4" +chrono = { version = "0.4.39", default-features = false } educe = { version = "0.6.0", default-features = false, features = [ "Debug" ] } -scraper = { version = "0.20.0", default-features = false } -jsonschema = { version = "0.21.0", default-features = false } -formatx = "0.2.2" +scraper = { version = "0.22.0", default-features = false } +jsonschema = { version = "0.28.3", default-features = false } +formatx = "0.2.3" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] tokio = { workspace = true, features = [ "fs", "macros" ] } @@ -34,5 +34,6 @@ tokio = { workspace = true, features = [ "fs", "macros", "rt" ] } [dev-dependencies] assert_matches.workspace = true +pretty_assertions.workspace = true tokio = { workspace = true, features = [ "macros", "rt" ] } toml.workspace = true diff --git a/eipw-lint/src/lib.rs b/eipw-lint/src/lib.rs index 8f445fab..e717611a 100644 --- a/eipw-lint/src/lib.rs +++ b/eipw-lint/src/lib.rs @@ -982,12 +982,12 @@ fn process<'a>( }; let options = comrak::Options { - extension: comrak::ExtensionOptionsBuilder::default() - .table(true) - .autolink(true) - .footnotes(true) - .build() - .unwrap(), + extension: comrak::ExtensionOptions { + table: true, + autolink: true, + footnotes: true, + ..Default::default() + }, ..Default::default() }; diff --git a/eipw-lint/src/tree.rs b/eipw-lint/src/tree.rs index 4ed8c1ee..3be2f65b 100644 --- a/eipw-lint/src/tree.rs +++ b/eipw-lint/src/tree.rs @@ -6,7 +6,7 @@ use comrak::arena_tree::{NodeEdge, Traverse}; use comrak::nodes::{ - Ast, AstNode, NodeCode, NodeCodeBlock, NodeDescriptionItem, NodeFootnoteDefinition, + Ast, AstNode, NodeAlert, NodeCode, NodeCodeBlock, NodeDescriptionItem, NodeFootnoteDefinition, NodeFootnoteReference, NodeHeading, NodeHtmlBlock, NodeLink, NodeList, NodeMath, NodeMultilineBlockQuote, NodeTable, NodeValue, NodeWikiLink, }; @@ -53,6 +53,7 @@ pub trait Visitor { NodeValue::Strong => self.enter_strong(&data), NodeValue::Strikethrough => self.enter_strikethrough(&data), NodeValue::Superscript => self.enter_superscript(&data), + NodeValue::Subscript => self.enter_subscript(&data), NodeValue::Link(nl) => self.enter_link(&data, nl), NodeValue::Image(nl) => self.enter_image(&data, nl), NodeValue::FootnoteReference(fr) => self.enter_footnote_reference(&data, fr), @@ -63,9 +64,15 @@ pub trait Visitor { NodeValue::MultilineBlockQuote(m) => self.enter_multiline_block_quote(&data, m), NodeValue::SpoileredText => self.enter_spoilered_text(&data), NodeValue::Escaped => self.enter_escaped(&data), + NodeValue::Raw(r) => self.enter_raw(&data, r), + NodeValue::Alert(a) => self.enter_alert(&data, a), } } + fn enter_alert(&mut self, _ast: &Ast, _alert: &NodeAlert) -> Result { + Ok(Next::TraverseChildren) + } + fn enter_document(&mut self, _ast: &Ast) -> Result { Ok(Next::TraverseChildren) } @@ -194,6 +201,10 @@ pub trait Visitor { Ok(Next::TraverseChildren) } + fn enter_subscript(&mut self, _ast: &Ast) -> Result { + Ok(Next::TraverseChildren) + } + fn enter_link(&mut self, _ast: &Ast, _link: &NodeLink) -> Result { Ok(Next::TraverseChildren) } @@ -242,9 +253,14 @@ pub trait Visitor { Ok(Next::TraverseChildren) } + fn enter_raw(&mut self, _ast: &Ast, _raw: &str) -> Result { + Ok(Next::TraverseChildren) + } + fn depart(&mut self, node: &AstNode) -> Result<(), Self::Error> { let data = node.data.borrow(); match &data.value { + NodeValue::Alert(a) => self.depart_alert(&data, a), NodeValue::Document => self.depart_document(&data), NodeValue::FrontMatter(fm) => self.depart_front_matter(&data, fm), NodeValue::BlockQuote => self.depart_block_quote(&data), @@ -273,6 +289,7 @@ pub trait Visitor { NodeValue::Strong => self.depart_strong(&data), NodeValue::Strikethrough => self.depart_strikethrough(&data), NodeValue::Superscript => self.depart_superscript(&data), + NodeValue::Subscript => self.depart_subscript(&data), NodeValue::Link(nl) => self.depart_link(&data, nl), NodeValue::Image(nl) => self.depart_image(&data, nl), NodeValue::FootnoteReference(fr) => self.depart_footnote_reference(&data, fr), @@ -283,9 +300,14 @@ pub trait Visitor { NodeValue::MultilineBlockQuote(m) => self.depart_multiline_block_quote(&data, m), NodeValue::SpoileredText => self.depart_spoilered_text(&data), NodeValue::Escaped => self.depart_escaped(&data), + NodeValue::Raw(r) => self.depart_raw(&data, r), } } + fn depart_alert(&mut self, _ast: &Ast, _alert: &NodeAlert) -> Result<(), Self::Error> { + Ok(()) + } + fn depart_document(&mut self, _ast: &Ast) -> Result<(), Self::Error> { Ok(()) } @@ -414,6 +436,10 @@ pub trait Visitor { Ok(()) } + fn depart_subscript(&mut self, _ast: &Ast) -> Result<(), Self::Error> { + Ok(()) + } + fn depart_link(&mut self, _ast: &Ast, _link: &NodeLink) -> Result<(), Self::Error> { Ok(()) } @@ -461,6 +487,10 @@ pub trait Visitor { fn depart_escaped(&mut self, _ast: &Ast) -> Result<(), Self::Error> { Ok(()) } + + fn depart_raw(&mut self, _ast: &Ast, _raw: &str) -> Result<(), Self::Error> { + Ok(()) + } } pub trait TraverseExt { diff --git a/eipw-lint/tests/eipv.rs b/eipw-lint/tests/eipv.rs index 7d4a4293..9120ea36 100644 --- a/eipw-lint/tests/eipv.rs +++ b/eipw-lint/tests/eipv.rs @@ -10,6 +10,7 @@ use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; use std::io::ErrorKind; use std::path::{Path, PathBuf}; diff --git a/eipw-lint/tests/eipv/markdown-json-cite/expected.txt b/eipw-lint/tests/eipv/markdown-json-cite/expected.txt index 6e6c341b..b758845a 100644 --- a/eipw-lint/tests/eipv/markdown-json-cite/expected.txt +++ b/eipw-lint/tests/eipv/markdown-json-cite/expected.txt @@ -1,12 +1,14 @@ error[markdown-json-cite]: code block of type `csl-json` does not conform to required schema --> input.md:42:1 | -42 | // ```csl-json -43 | || { -44 | || "type": "article", -45 | || "id": "1", -46 | || "URL": "3" - | ||__________________^ "3" is not a "uri" - | ||__________________^ "DOI" is a required property +42 | / ```csl-json +43 | | { +44 | | "type": "article", +45 | | "id": "1", +46 | | "URL": "3" + | | ^ + | |__________________| + | "3" is not a "uri" + | "DOI" is a required property | = help: see https://github.com/ethereum/eipw/blob/master/eipw-lint/src/lints/markdown/json_schema/citation.json diff --git a/eipw-lint/tests/eipv/preamble-missing-required/expected.txt b/eipw-lint/tests/eipv/preamble-missing-required/expected.txt index 6e1884b9..bc540307 100644 --- a/eipw-lint/tests/eipv/preamble-missing-required/expected.txt +++ b/eipw-lint/tests/eipv/preamble-missing-required/expected.txt @@ -8,6 +8,7 @@ error[preamble-requires-ref-title]: proposals mentioned in preamble header `titl --> input.md:3:31 | 3 | title: A sample extension for EIP-1 and EIP-5 - | ^^^^^ mentioned here - | ^^^^^ mentioned here + | ^^^^^ ^^^^^ mentioned here + | | + | mentioned here | diff --git a/eipw-lint/tests/eipv/preamble-requires-no-whitespace/expected.txt b/eipw-lint/tests/eipv/preamble-requires-no-whitespace/expected.txt index 07e23a08..6af9bf2d 100644 --- a/eipw-lint/tests/eipv/preamble-requires-no-whitespace/expected.txt +++ b/eipw-lint/tests/eipv/preamble-requires-no-whitespace/expected.txt @@ -2,6 +2,7 @@ error[preamble-list-requires]: preamble header list items must begin with a spac --> input.md:11:13 | 11 | requires: 20,1337,2048 - | ^ missing space - | ^ missing space + | ^ ^ missing space + | | + | missing space | diff --git a/eipw-lint/tests/eipv/preamble-requires-too-unstable/expected.txt b/eipw-lint/tests/eipv/preamble-requires-too-unstable/expected.txt index 892cdffc..8c119d73 100644 --- a/eipw-lint/tests/eipv/preamble-requires-too-unstable/expected.txt +++ b/eipw-lint/tests/eipv/preamble-requires-too-unstable/expected.txt @@ -2,7 +2,8 @@ error[preamble-requires-status]: preamble header `requires` contains items not s --> input.md:12:10 | 12 | requires: 20, 1337, 2048 - | ^^^ has a less advanced status - | ^^^^^ has a less advanced status + | ^^^ ^^^^^ has a less advanced status + | | + | has a less advanced status | = help: valid `status` values for this proposal are: `Draft`, `Stagnant` diff --git a/eipw-lint/tests/lint_markdown_heading_first.rs b/eipw-lint/tests/lint_markdown_heading_first.rs index b6d422f3..efd26a89 100644 --- a/eipw-lint/tests/lint_markdown_heading_first.rs +++ b/eipw-lint/tests/lint_markdown_heading_first.rs @@ -5,6 +5,7 @@ */ use eipw_lint::{lints::markdown::HeadingFirst, reporters::Text, Linter}; +use pretty_assertions::assert_eq; #[tokio::test] async fn invalid_eip() { diff --git a/eipw-lint/tests/lint_markdown_headings_space.rs b/eipw-lint/tests/lint_markdown_headings_space.rs index 37e7618e..bf723909 100644 --- a/eipw-lint/tests/lint_markdown_headings_space.rs +++ b/eipw-lint/tests/lint_markdown_headings_space.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::markdown::HeadingsSpace; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn normal_headings() { diff --git a/eipw-lint/tests/lint_markdown_html_comments.rs b/eipw-lint/tests/lint_markdown_html_comments.rs index e270bf4e..e1281735 100644 --- a/eipw-lint/tests/lint_markdown_html_comments.rs +++ b/eipw-lint/tests/lint_markdown_html_comments.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::markdown::HtmlComments; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn warn() { diff --git a/eipw-lint/tests/lint_markdown_json_schema.rs b/eipw-lint/tests/lint_markdown_json_schema.rs index 60f9081c..229f421b 100644 --- a/eipw-lint/tests/lint_markdown_json_schema.rs +++ b/eipw-lint/tests/lint_markdown_json_schema.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::markdown::JsonSchema; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn invalid_json() { diff --git a/eipw-lint/tests/lint_markdown_link_first.rs b/eipw-lint/tests/lint_markdown_link_first.rs index d7b51a1c..89f97dfd 100644 --- a/eipw-lint/tests/lint_markdown_link_first.rs +++ b/eipw-lint/tests/lint_markdown_link_first.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::markdown::LinkFirst; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn unlinked_then_linked_with_header() { diff --git a/eipw-lint/tests/lint_markdown_no_backticks.rs b/eipw-lint/tests/lint_markdown_no_backticks.rs index 0bcb89c8..716c5165 100644 --- a/eipw-lint/tests/lint_markdown_no_backticks.rs +++ b/eipw-lint/tests/lint_markdown_no_backticks.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::markdown::NoBackticks; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn eip_in_backticks() { diff --git a/eipw-lint/tests/lint_markdown_regex.rs b/eipw-lint/tests/lint_markdown_regex.rs index 27d13b15..6de73980 100644 --- a/eipw-lint/tests/lint_markdown_regex.rs +++ b/eipw-lint/tests/lint_markdown_regex.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::markdown::regex::{Mode, Regex}; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn excludes_link_match_in_text() { diff --git a/eipw-lint/tests/lint_markdown_relative_links.rs b/eipw-lint/tests/lint_markdown_relative_links.rs index a2b5ed00..d8237130 100644 --- a/eipw-lint/tests/lint_markdown_relative_links.rs +++ b/eipw-lint/tests/lint_markdown_relative_links.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::markdown::RelativeLinks; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn inline_link_to_consensus_specs() { diff --git a/eipw-lint/tests/lint_markdown_section_order.rs b/eipw-lint/tests/lint_markdown_section_order.rs index 9ce92d97..bd353495 100644 --- a/eipw-lint/tests/lint_markdown_section_order.rs +++ b/eipw-lint/tests/lint_markdown_section_order.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::markdown::SectionOrder; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn one_extra() { diff --git a/eipw-lint/tests/lint_markdown_section_required.rs b/eipw-lint/tests/lint_markdown_section_required.rs index 997406cc..da5afda3 100644 --- a/eipw-lint/tests/lint_markdown_section_required.rs +++ b/eipw-lint/tests/lint_markdown_section_required.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::markdown::SectionRequired; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn one_missing() { diff --git a/eipw-lint/tests/lint_preamble_author.rs b/eipw-lint/tests/lint_preamble_author.rs index 21c16d89..bac7f1c7 100644 --- a/eipw-lint/tests/lint_preamble_author.rs +++ b/eipw-lint/tests/lint_preamble_author.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::Author; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn unicode_invalid() { diff --git a/eipw-lint/tests/lint_preamble_date.rs b/eipw-lint/tests/lint_preamble_date.rs index ae0f000c..b92c95a9 100644 --- a/eipw-lint/tests/lint_preamble_date.rs +++ b/eipw-lint/tests/lint_preamble_date.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::Date; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn single_digit_month() { diff --git a/eipw-lint/tests/lint_preamble_file_name.rs b/eipw-lint/tests/lint_preamble_file_name.rs index 788cf2f9..e78e46c9 100644 --- a/eipw-lint/tests/lint_preamble_file_name.rs +++ b/eipw-lint/tests/lint_preamble_file_name.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::FileName; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn unicode() { diff --git a/eipw-lint/tests/lint_preamble_length.rs b/eipw-lint/tests/lint_preamble_length.rs index ffd61b3b..4d188fd4 100644 --- a/eipw-lint/tests/lint_preamble_length.rs +++ b/eipw-lint/tests/lint_preamble_length.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::Length; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn unicode() { diff --git a/eipw-lint/tests/lint_preamble_list.rs b/eipw-lint/tests/lint_preamble_list.rs index 05880e9d..6d0ce7aa 100644 --- a/eipw-lint/tests/lint_preamble_list.rs +++ b/eipw-lint/tests/lint_preamble_list.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::List; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn comma_first() { @@ -110,8 +111,9 @@ hello world"#; r#"error[preamble-list]: preamble header list items must begin with a space | 2 | header: foo,bar,example.com/foo?bar - | ^ missing space - | ^ missing space + | ^ ^ missing space + | | + | missing space | "#, ); @@ -138,9 +140,10 @@ hello world"#; r#"error[preamble-list]: preamble header list items have extra whitespace | 2 | header: foo , bar, bizz , example.com/foo?bar - | ^^^^ extra space - | ^^^^^ extra space - | ^^^^^^^^^ extra space + | ^^^^ ^^^^^ ^^^^^^^^^ extra space + | | | + | | extra space + | extra space | "#, ); @@ -186,8 +189,9 @@ hello world"#; r#"error[preamble-list]: preamble header list items have extra whitespace | 2 | author: Bánana Banana (@banana), banana (@banana), Orangé Banana (@banana) - | ^^^^^^^^^^^^^^^^^^ extra space - | ^^^^^^^^^^^^^^^^^^^^^^^^^ extra space + | ^^^^^^^^^^^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^ extra space + | | + | extra space | "# ); diff --git a/eipw-lint/tests/lint_preamble_no_duplicates.rs b/eipw-lint/tests/lint_preamble_no_duplicates.rs index 02788f1d..63c4256e 100644 --- a/eipw-lint/tests/lint_preamble_no_duplicates.rs +++ b/eipw-lint/tests/lint_preamble_no_duplicates.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::no_duplicates::NoDuplicates; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn unicode() { diff --git a/eipw-lint/tests/lint_preamble_one_of.rs b/eipw-lint/tests/lint_preamble_one_of.rs index 0c0ab854..c499ffb5 100644 --- a/eipw-lint/tests/lint_preamble_one_of.rs +++ b/eipw-lint/tests/lint_preamble_one_of.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::OneOf; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn unicode() { diff --git a/eipw-lint/tests/lint_preamble_order.rs b/eipw-lint/tests/lint_preamble_order.rs index 38261bdc..a81d9cd6 100644 --- a/eipw-lint/tests/lint_preamble_order.rs +++ b/eipw-lint/tests/lint_preamble_order.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::Order; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn one_extra_unicode() { diff --git a/eipw-lint/tests/lint_preamble_regex.rs b/eipw-lint/tests/lint_preamble_regex.rs index 20aa2316..cd9fa18b 100644 --- a/eipw-lint/tests/lint_preamble_regex.rs +++ b/eipw-lint/tests/lint_preamble_regex.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::regex::{Mode, Regex}; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn unicode() { diff --git a/eipw-lint/tests/lint_preamble_require_reference.rs b/eipw-lint/tests/lint_preamble_require_reference.rs index dbc26e08..2d30007c 100644 --- a/eipw-lint/tests/lint_preamble_require_reference.rs +++ b/eipw-lint/tests/lint_preamble_require_reference.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::RequireReferenced; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn valid() { @@ -88,8 +89,9 @@ hello world"#; r#"error[preamble-req-ref]: proposals mentioned in preamble header `header` must appear in `other` | 2 | header: Exténsion of EIP-9999 ánd EIP-44 - | ^^^^^^^^ mentioned here - | ^^^^^^ mentioned here + | ^^^^^^^^ ^^^^^^ mentioned here + | | + | mentioned here | "# ); @@ -157,8 +159,9 @@ hello world"#; r#"error[preamble-req-ref]: proposals mentioned in preamble header `header` must appear in `other` | 2 | header: Extension of EIP-9999 and EIP-45 - | ^^^^^^^^ mentioned here - | ^^^^^^ mentioned here + | ^^^^^^^^ ^^^^^^ mentioned here + | | + | mentioned here | "# ); @@ -192,8 +195,9 @@ hello world"#; r#"error[preamble-req-ref]: proposals mentioned in preamble header `header` must appear in `other` | 2 | header: Extension of EIP-9999 and ERC-45 - | ^^^^^^^^ mentioned here - | ^^^^^^ mentioned here + | ^^^^^^^^ ^^^^^^ mentioned here + | | + | mentioned here | "# ); diff --git a/eipw-lint/tests/lint_preamble_required.rs b/eipw-lint/tests/lint_preamble_required.rs index e97b3536..503a7cc1 100644 --- a/eipw-lint/tests/lint_preamble_required.rs +++ b/eipw-lint/tests/lint_preamble_required.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::Required; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn one_missing() { diff --git a/eipw-lint/tests/lint_preamble_required_if_eq.rs b/eipw-lint/tests/lint_preamble_required_if_eq.rs index 3771f309..0b7ad83c 100644 --- a/eipw-lint/tests/lint_preamble_required_if_eq.rs +++ b/eipw-lint/tests/lint_preamble_required_if_eq.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::RequiredIfEq; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn without_when_or_then() { diff --git a/eipw-lint/tests/lint_preamble_trim.rs b/eipw-lint/tests/lint_preamble_trim.rs index 33df2937..32e03037 100644 --- a/eipw-lint/tests/lint_preamble_trim.rs +++ b/eipw-lint/tests/lint_preamble_trim.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::Trim; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn missing_space_unicode() { diff --git a/eipw-lint/tests/lint_preamble_uint.rs b/eipw-lint/tests/lint_preamble_uint.rs index e4219e7d..0cda8e42 100644 --- a/eipw-lint/tests/lint_preamble_uint.rs +++ b/eipw-lint/tests/lint_preamble_uint.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::Uint; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn valid() { diff --git a/eipw-lint/tests/lint_preamble_uint_list.rs b/eipw-lint/tests/lint_preamble_uint_list.rs index 9358c608..94eff82a 100644 --- a/eipw-lint/tests/lint_preamble_uint_list.rs +++ b/eipw-lint/tests/lint_preamble_uint_list.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::UintList; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn unicode() { @@ -29,8 +30,9 @@ hello world"#; r#"error[preamble-uint-list]: preamble header `header` items must be unsigned integers | 2 | header: 5, -1, 2, héllo world, 9 - | ^^^ not a non-negative integer - | ^^^^^^^^^^^^ not a non-negative integer + | ^^^ ^^^^^^^^^^^^ not a non-negative integer + | | + | not a non-negative integer | error[preamble-uint-list]: preamble header `header` items must be sorted in ascending order | @@ -61,8 +63,9 @@ hello world"#; r#"error[preamble-uint-list]: preamble header `header` items must be unsigned integers | 2 | header: 5, -1, 2, hello world, 9 - | ^^^ not a non-negative integer - | ^^^^^^^^^^^^ not a non-negative integer + | ^^^ ^^^^^^^^^^^^ not a non-negative integer + | | + | not a non-negative integer | error[preamble-uint-list]: preamble header `header` items must be sorted in ascending order | diff --git a/eipw-lint/tests/lint_preamble_url.rs b/eipw-lint/tests/lint_preamble_url.rs index 520d491c..73c689a9 100644 --- a/eipw-lint/tests/lint_preamble_url.rs +++ b/eipw-lint/tests/lint_preamble_url.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::Url; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn unicode() { diff --git a/eipw-lint/tests/warning.rs b/eipw-lint/tests/warning.rs index 68b1657f..45f4ebee 100644 --- a/eipw-lint/tests/warning.rs +++ b/eipw-lint/tests/warning.rs @@ -7,6 +7,7 @@ use eipw_lint::lints::preamble::Trim; use eipw_lint::reporters::Text; use eipw_lint::Linter; +use pretty_assertions::assert_eq; #[tokio::test] async fn warning() { diff --git a/eipw-snippets/Cargo.toml b/eipw-snippets/Cargo.toml index d67aa262..1e0fbb46 100644 --- a/eipw-snippets/Cargo.toml +++ b/eipw-snippets/Cargo.toml @@ -10,7 +10,7 @@ repository.workspace = true [dependencies] serde = { workspace = true, features = [ "derive" ] } -annotate-snippets = "0.11.4" +annotate-snippets = "0.11.5" [dev-dependencies] serde_json.workspace = true