diff options
author | AtomicFS | 2023-04-03 00:11:42 +0200 |
---|---|---|
committer | AtomicFS | 2023-04-03 00:11:42 +0200 |
commit | d40031a5f9e8b4b113029e3c445305ca172f26f7 (patch) | |
tree | 68ca0aa784dfeccd103273fdfc237f469ba404a8 | |
parent | 9f2d96a664e679988f8cd8de216bd05f5c0c2c5f (diff) | |
download | aur-d40031a5f9e8b4b113029e3c445305ca172f26f7.tar.gz |
move to mdbook 1.0.0.alpha7 and enable GFM extension
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 4 | ||||
-rw-r--r-- | mdbook-rss.patch | 400 |
3 files changed, 233 insertions, 175 deletions
@@ -1,7 +1,7 @@ pkgbase = mdbook-rss-git pkgdesc = A preprocessor for mdbook to generate an RSS feed from your chapters pkgver = 8.dc948c6 - pkgrel = 1 + pkgrel = 2 url = https://gitlab.com/albalitz/mdbook-rss arch = x86_64 license = MPL @@ -10,6 +10,6 @@ pkgbase = mdbook-rss-git source = git+https://gitlab.com/albalitz/mdbook-rss.git source = mdbook-rss.patch sha256sums = SKIP - sha256sums = d81c8b821e17ee91daf5e2e2d33707a815eb01ec1b55c4deb220058589d3b85d + sha256sums = b644bfb8e6b1efb5f0f2bb314b629d7c2079503b2677a9130ee1a116134077a2 pkgname = mdbook-rss-git @@ -3,7 +3,7 @@ pkgname=mdbook-rss-git _pkgname=mdbook-rss pkgver=8.dc948c6 -pkgrel=1 +pkgrel=2 pkgdesc="A preprocessor for mdbook to generate an RSS feed from your chapters" url="https://gitlab.com/albalitz/mdbook-rss" arch=(x86_64) @@ -12,7 +12,7 @@ makedepends=(rust cargo) source=("git+${url}.git" 'mdbook-rss.patch') sha256sums=('SKIP' - 'd81c8b821e17ee91daf5e2e2d33707a815eb01ec1b55c4deb220058589d3b85d') + 'b644bfb8e6b1efb5f0f2bb314b629d7c2079503b2677a9130ee1a116134077a2') # https://wiki.archlinux.org/index.php/VCS_package_guidelines#The_pkgver()_function pkgver() { diff --git a/mdbook-rss.patch b/mdbook-rss.patch index a644c60c7c2b..2dc5b9cfa7a6 100644 --- a/mdbook-rss.patch +++ b/mdbook-rss.patch @@ -1,6 +1,7 @@ -diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Cargo.lock ---- mdbook-rss.orig/Cargo.lock 2023-03-31 22:50:41.743051671 +0200 -+++ mdbook-rss.new/Cargo.lock 2023-03-31 22:58:50.974074354 +0200 +diff --git a/Cargo.lock b/Cargo.lock +index 9c93e53..2fd6c4c 100644 +--- a/Cargo.lock ++++ b/Cargo.lock @@ -1,43 +1,92 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. @@ -35,7 +36,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "url", ] - [[package]] ++[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -44,7 +45,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg + "libc", +] + -+[[package]] + [[package]] name = "ansi_term" -version = "0.11.0" +version = "0.12.1" @@ -72,8 +73,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg +[[package]] +name = "anstyle" +version = "0.3.5" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ea9e81bd02e310c216d080f6223c179012256e5151c41db88d12c88a1684d2" + +[[package]] @@ -81,17 +81,18 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7d1bb534e9efed14f3e5f44e7dd1a4f709384023a4165199a4241e18dff0116" - dependencies = [ -- "winapi 0.3.9", ++dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-wincon" +version = "0.2.0" -+source = "registry+https://github.com/rust-lang/crates.io-index" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "c3127af6145b149f3287bb9a0d10ad9c5692dba8c53ad48285e5bec4063834fa" -+dependencies = [ + dependencies = [ +- "winapi 0.3.9", + "anstyle", + "windows-sys 0.45.0", ] @@ -106,7 +107,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg [[package]] name = "atom_syndication" -@@ -57,103 +106,79 @@ +@@ -57,103 +106,79 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ @@ -144,15 +145,14 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg [[package]] name = "bitflags" -version = "1.2.1" -+version = "1.3.2" - source = "registry+https://github.com/rust-lang/crates.io-index" +-source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - - [[package]] - name = "block-buffer" +- +-[[package]] +-name = "block-buffer" -version = "0.7.3" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "1.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", @@ -160,9 +160,10 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg - "byteorder", - "generic-array 0.12.3", -] -- --[[package]] --name = "block-buffer" ++checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + + [[package]] + name = "block-buffer" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" @@ -238,7 +239,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg [[package]] name = "cfg-if" -@@ -163,22 +188,24 @@ +@@ -163,22 +188,24 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "chrono" @@ -269,7 +270,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg dependencies = [ "ansi_term", "atty", -@@ -190,10 +217,156 @@ +@@ -190,10 +217,156 @@ dependencies = [ ] [[package]] @@ -277,8 +278,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg -version = "0.1.2" +name = "clap" +version = "4.2.1" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046ae530c528f252094e4a77886ee1374437744b2bff1497aa898bbddbbb29b3" +dependencies = [ + "clap_builder", @@ -413,7 +413,8 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg +[[package]] +name = "cxxbridge-flags" +version = "1.0.94" -+source = "registry+https://github.com/rust-lang/crates.io-index" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634" +checksum = "7944172ae7e4068c533afbb984114a56c46e9ccddda550499caa222902c7f7bb" + +[[package]] @@ -429,7 +430,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg [[package]] name = "darling" -@@ -216,7 +389,7 @@ +@@ -216,7 +389,7 @@ dependencies = [ "proc-macro2", "quote", "strsim 0.9.3", @@ -438,7 +439,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg ] [[package]] -@@ -227,7 +400,7 @@ +@@ -227,7 +400,7 @@ checksum = "d9b5a2f4ac4969822c62224815d069952656cadc7084fdca9751e6d959189b72" dependencies = [ "darling_core", "quote", @@ -447,7 +448,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg ] [[package]] -@@ -240,7 +413,7 @@ +@@ -240,7 +413,7 @@ dependencies = [ "derive_builder_core", "proc-macro2", "quote", @@ -456,31 +457,31 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg ] [[package]] -@@ -252,74 +425,57 @@ +@@ -252,74 +425,57 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn", +-] +- +-[[package]] +-name = "digest" +-version = "0.8.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +-dependencies = [ +- "generic-array 0.12.3", + "syn 1.0.109", ] [[package]] name = "digest" --version = "0.8.1" +-version = "0.9.0" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" +-checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" +checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" dependencies = [ -- "generic-array 0.12.3", --] -- --[[package]] --name = "digest" --version = "0.9.0" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" --dependencies = [ - "generic-array 0.14.4", + "block-buffer", + "crypto-common", @@ -497,13 +498,13 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "chrono", ] - [[package]] +-[[package]] -name = "dtoa" -version = "0.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88d7ed2934d741c6b37e33e3832298e8850b53fd2d2bea03873375596c7cea4e" - --[[package]] + [[package]] name = "elasticlunr-rs" -version = "2.3.10" +version = "3.0.2" @@ -546,7 +547,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "log", "regex", "termcolor", -@@ -327,115 +483,109 @@ +@@ -327,115 +483,109 @@ dependencies = [ [[package]] name = "env_logger" @@ -714,19 +715,19 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg dependencies = [ "futures-core", "futures-sink", -@@ -443,117 +593,79 @@ +@@ -443,117 +593,79 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.13" -+version = "0.3.28" - source = "registry+https://github.com/rust-lang/crates.io-index" +-source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94" - -[[package]] -name = "futures-io" -version = "0.3.13" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "0.3.28" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" @@ -784,8 +785,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg [[package]] name = "generic-array" -version = "0.12.3" -+version = "0.14.7" - source = "registry+https://github.com/rust-lang/crates.io-index" +-source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" -dependencies = [ - "typenum", @@ -794,7 +794,8 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg -[[package]] -name = "generic-array" -version = "0.14.4" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "0.14.7" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ @@ -802,7 +803,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "version_check", ] - [[package]] +-[[package]] -name = "getopts" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" @@ -812,7 +813,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg -] - -[[package]] - name = "getrandom" +-name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" @@ -822,8 +823,8 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg - "wasi 0.9.0+wasi-snapshot-preview1", -] - --[[package]] --name = "getrandom" + [[package]] + name = "getrandom" -version = "0.2.2" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -853,7 +854,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg ] [[package]] -@@ -567,15 +679,15 @@ +@@ -567,15 +679,15 @@ dependencies = [ [[package]] name = "glob" @@ -873,7 +874,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg dependencies = [ "aho-corasick", "bstr", -@@ -600,11 +712,11 @@ +@@ -600,11 +712,11 @@ dependencies = [ [[package]] name = "h2" @@ -888,7 +889,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "fnv", "futures-core", "futures-sink", -@@ -615,43 +727,42 @@ +@@ -615,43 +727,42 @@ dependencies = [ "tokio", "tokio-util", "tracing", @@ -943,7 +944,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg ] [[package]] -@@ -664,78 +775,76 @@ +@@ -664,78 +775,76 @@ dependencies = [ ] [[package]] @@ -970,13 +971,13 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "libc", ] - [[package]] ++[[package]] +name = "hermit-abi" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + -+[[package]] + [[package]] name = "html5ever" -version = "0.25.1" +version = "0.26.0" @@ -1048,7 +1049,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg [[package]] name = "humantime" -@@ -745,11 +854,11 @@ +@@ -745,11 +854,11 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" @@ -1063,7 +1064,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "futures-channel", "futures-core", "futures-util", -@@ -759,7 +868,7 @@ +@@ -759,7 +868,7 @@ dependencies = [ "httparse", "httpdate", "itoa", @@ -1072,10 +1073,11 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "socket2", "tokio", "tower-service", -@@ -768,6 +877,30 @@ +@@ -767,6 +876,30 @@ dependencies = [ + "want", ] - [[package]] ++[[package]] +name = "iana-time-zone" +version = "0.1.54" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1099,11 +1101,10 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg + "cxx-build", +] + -+[[package]] + [[package]] name = "ident_case" version = "1.0.1" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -775,20 +908,19 @@ +@@ -775,20 +908,19 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" @@ -1128,7 +1129,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg dependencies = [ "autocfg", "hashbrown", -@@ -796,9 +928,9 @@ +@@ -796,9 +928,9 @@ dependencies = [ [[package]] name = "inotify" @@ -1140,7 +1141,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg dependencies = [ "bitflags", "inotify-sys", -@@ -815,28 +947,51 @@ +@@ -815,28 +947,51 @@ dependencies = [ ] [[package]] @@ -1201,7 +1202,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg [[package]] name = "json" -@@ -845,13 +1000,23 @@ +@@ -845,46 +1000,75 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "078e285eafdfb6c4b434e0d31e8cfcb5115b651496faca5749b88fafd4f23bfd" [[package]] @@ -1209,29 +1210,28 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg -version = "0.2.2" +name = "kqueue" +version = "1.0.7" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" -+dependencies = [ -+ "kqueue-sys", -+ "libc", -+] -+ -+[[package]] -+name = "kqueue-sys" -+version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" -+checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" ++checksum = "2c8fc60ba15bf51257aa9807a48a61013db043fcf3a78cb0d916e8e396dcad98" dependencies = [ - "winapi 0.2.8", - "winapi-build", -+ "bitflags", ++ "kqueue-sys", + "libc", ] [[package]] -@@ -861,30 +1026,55 @@ - checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +-name = "lazy_static" +-version = "1.4.0" ++name = "kqueue-sys" ++version = "1.0.3" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" ++dependencies = [ ++ "bitflags", ++ "libc", ++] [[package]] -name = "lazycell" @@ -1258,8 +1258,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg name = "linked-hash-map" -version = "0.5.4" +version = "0.5.6" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] @@ -1271,7 +1270,8 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg +[[package]] +name = "linux-raw-sys" +version = "0.3.1" -+source = "registry+https://github.com/rust-lang/crates.io-index" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "d59d8c75012853d2e872fb56bc8a2e53718e2cafe1a4c823143141c6d90c322f" + +[[package]] @@ -1297,7 +1297,21 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg ] [[package]] -@@ -912,68 +1102,49 @@ +@@ -901,79 +1085,58 @@ checksum = "3e2e65a1a2e43cfcb47a895c4c8b10d1f4a61097f9f254f183aee60cad9c651d" + + [[package]] + name = "markdown" +-version = "0.3.0" ++version = "1.0.0-alpha.7" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "ef3aab6a1d529b112695f72beec5ee80e729cb45af58663ec902c8fac764ecdd" ++checksum = "98de49c677e95e00eaa74c42a0b07ea55e1e0b1ebca5b2cbc7657f288cd714eb" + dependencies = [ +- "lazy_static", +- "pipeline", +- "regex", ++ "unicode-id", + ] [[package]] name = "markup5ever" @@ -1318,7 +1332,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "tendril", ] - [[package]] +-[[package]] -name = "markup5ever_rcdom" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1336,7 +1350,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" - --[[package]] + [[package]] name = "mdbook" -version = "0.4.7" +version = "0.4.28" @@ -1377,7 +1391,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "warp", ] -@@ -982,8 +1153,8 @@ +@@ -982,8 +1145,8 @@ name = "mdbook-rss" version = "0.1.0" dependencies = [ "anyhow", @@ -1388,7 +1402,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "getset", "globset", "gray_matter", -@@ -998,21 +1169,21 @@ +@@ -998,21 +1161,21 @@ dependencies = [ [[package]] name = "memchr" @@ -1416,7 +1430,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg dependencies = [ "mime", "unicase", -@@ -1020,56 +1191,14 @@ +@@ -1020,56 +1183,14 @@ dependencies = [ [[package]] name = "mio" @@ -1477,7 +1491,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg ] [[package]] -@@ -1080,27 +1209,37 @@ +@@ -1080,27 +1201,37 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54" [[package]] name = "notify" @@ -1522,7 +1536,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg dependencies = [ "autocfg", "num-traits", -@@ -1108,61 +1247,83 @@ +@@ -1108,61 +1239,83 @@ dependencies = [ [[package]] name = "num-traits" @@ -1535,7 +1549,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "autocfg", ] - [[package]] ++[[package]] +name = "num_cpus" +version = "1.15.0" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1545,7 +1559,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg + "libc", +] + -+[[package]] + [[package]] name = "once_cell" -version = "1.7.0" +version = "1.17.1" @@ -1627,7 +1641,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg dependencies = [ "pest", "pest_generator", -@@ -1170,42 +1331,42 @@ +@@ -1170,42 +1323,42 @@ dependencies = [ [[package]] name = "pest_generator" @@ -1681,7 +1695,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg dependencies = [ "phf_generator", "phf_shared", -@@ -1213,74 +1374,48 @@ +@@ -1213,74 +1366,48 @@ dependencies = [ [[package]] name = "phf_generator" @@ -1756,21 +1770,29 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg [[package]] name = "pin-project-lite" -version = "0.1.11" -+version = "0.2.9" - source = "registry+https://github.com/rust-lang/crates.io-index" +-source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c917123afa01924fc84bb20c4c03f004d9c38e5127e3c039bbf7f4b9c76a2f6b" - -[[package]] -name = "pin-project-lite" -version = "0.2.4" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "0.2.9" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" -@@ -1296,9 +1431,9 @@ +@@ -1288,17 +1415,11 @@ version = "0.1.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +-[[package]] +-name = "pipeline" +-version = "0.5.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d15b6607fa632996eb8a17c9041cb6071cb75ac057abd45dece578723ea8c7c0" +- [[package]] name = "ppv-lite86" -version = "0.2.10" @@ -1781,7 +1803,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg [[package]] name = "precomputed-hash" -@@ -1315,7 +1450,7 @@ +@@ -1315,7 +1436,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2", "quote", @@ -1790,10 +1812,15 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "version_check", ] -@@ -1331,51 +1466,26 @@ - ] - - [[package]] +@@ -1326,55 +1447,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" + dependencies = [ + "proc-macro2", +- "quote", +- "version_check", +-] +- +-[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1804,8 +1831,11 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086" -- --[[package]] ++ "quote", ++ "version_check", ++] + + [[package]] name = "proc-macro2" -version = "1.0.24" +version = "1.0.54" @@ -1831,7 +1861,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "unicase", ] - [[package]] +-[[package]] -name = "quick-error" -version = "1.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" @@ -1843,11 +1873,10 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ac73b1112776fc109b2e61909bc46c7e1bf0d7f690ffb1676553acce16d5cda" - --[[package]] + [[package]] name = "quick-xml" version = "0.20.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -1387,156 +1497,137 @@ +@@ -1387,156 +1483,137 @@ dependencies = [ [[package]] name = "quote" @@ -2021,15 +2050,15 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg [[package]] -name = "regex-syntax" -version = "0.6.22" -+name = "rustix" -+version = "0.37.6" - source = "registry+https://github.com/rust-lang/crates.io-index" +-source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" - -[[package]] -name = "remove_dir_all" -version = "0.5.3" --source = "registry+https://github.com/rust-lang/crates.io-index" ++name = "rustix" ++version = "0.37.6" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" +checksum = "d097081ed288dfe45699b72f5b5d648e5f15d64d900c7080273baa20c16a6849" dependencies = [ @@ -2067,7 +2096,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg [[package]] name = "same-file" -@@ -1549,35 +1640,47 @@ +@@ -1549,35 +1626,47 @@ dependencies = [ [[package]] name = "scoped-tls" @@ -2124,7 +2153,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg dependencies = [ "itoa", "ryu", -@@ -1586,78 +1689,84 @@ +@@ -1586,78 +1675,84 @@ dependencies = [ [[package]] name = "serde_urlencoded" @@ -2241,7 +2270,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "phf_shared", "precomputed-hash", "serde", -@@ -1665,9 +1774,9 @@ +@@ -1665,9 +1760,9 @@ dependencies = [ [[package]] name = "string_cache_codegen" @@ -2253,7 +2282,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg dependencies = [ "phf_generator", "phf_shared", -@@ -1688,53 +1797,51 @@ +@@ -1688,53 +1783,51 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6446ced80d6c486436db5c078dde11a9f73d42b57fb273121e160b84f63d894c" [[package]] @@ -2326,7 +2355,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg dependencies = [ "futf", "mac", -@@ -1743,14 +1850,24 @@ +@@ -1743,13 +1836,23 @@ dependencies = [ [[package]] name = "termcolor" @@ -2339,7 +2368,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "winapi-util", ] - [[package]] ++[[package]] +name = "terminal_size" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2349,11 +2378,10 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg + "windows-sys 0.45.0", +] + -+[[package]] + [[package]] name = "textwrap" version = "0.11.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -1761,196 +1878,193 @@ +@@ -1761,196 +1864,193 @@ dependencies = [ [[package]] name = "thiserror" @@ -2519,13 +2547,13 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "serde", ] - [[package]] ++[[package]] +name = "topological-sort" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea68304e134ecd095ac6c3574494fc62b909f416c4fca77e440530221e549d3d" + -+[[package]] + [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.2" @@ -2552,20 +2580,20 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg [[package]] name = "tracing-core" -version = "0.1.17" -+version = "0.1.30" - source = "registry+https://github.com/rust-lang/crates.io-index" +-source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f" -+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" - dependencies = [ +-dependencies = [ - "lazy_static", -] - -[[package]] -name = "tracing-futures" -version = "0.2.5" --source = "registry+https://github.com/rust-lang/crates.io-index" ++version = "0.1.30" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" --dependencies = [ ++checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" + dependencies = [ - "pin-project 1.0.5", - "tracing", + "once_cell", @@ -2623,7 +2651,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg [[package]] name = "unicase" -@@ -1963,63 +2077,53 @@ +@@ -1963,63 +2063,59 @@ dependencies = [ [[package]] name = "unicode-bidi" @@ -2635,39 +2663,44 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg - "matches", -] +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" -+ -+[[package]] -+name = "unicode-ident" -+version = "1.0.8" -+source = "registry+https://github.com/rust-lang/crates.io-index" -+checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" [[package]] - name = "unicode-normalization" +-name = "unicode-normalization" -version = "0.1.17" -+version = "0.1.22" ++name = "unicode-id" ++version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07fbfce1c8a97d547e8b5334978438d9d6ec8c20e38f56d4a4374d181493eaef" -+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" - dependencies = [ - "tinyvec", - ] +-dependencies = [ +- "tinyvec", +-] ++checksum = "d70b6494226b36008c8366c288d77190b3fad2eb4c10533139c1c1f461127f1a" [[package]] -name = "unicode-segmentation" -version = "1.7.1" --source = "registry+https://github.com/rust-lang/crates.io-index" ++name = "unicode-ident" ++version = "1.0.8" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0d2e7be6ae3a5fa87eed5fb451aff96f2573d2694942e40543ae0bbe19c796" -- --[[package]] - name = "unicode-width" ++checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4" + + [[package]] +-name = "unicode-width" -version = "0.1.8" --source = "registry+https://github.com/rust-lang/crates.io-index" ++name = "unicode-normalization" ++version = "0.1.22" + source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" -- --[[package]] ++checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" ++dependencies = [ ++ "tinyvec", ++] + + [[package]] -name = "unicode-xid" -version = "0.2.1" ++name = "unicode-width" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" @@ -2707,7 +2740,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg [[package]] name = "vec_map" -@@ -2029,18 +2133,17 @@ +@@ -2029,18 +2125,17 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" @@ -2730,7 +2763,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg "winapi-util", ] -@@ -2056,58 +2159,99 @@ +@@ -2056,58 +2151,99 @@ dependencies = [ [[package]] name = "warp" @@ -2820,8 +2853,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.84" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" ++source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5" +dependencies = [ + "quote", @@ -2844,25 +2876,26 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.84" -+source = "registry+https://github.com/rust-lang/crates.io-index" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" +checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d" [[package]] name = "winapi" -@@ -2120,12 +2264,6 @@ +@@ -2119,12 +2255,6 @@ dependencies = [ + "winapi-x86_64-pc-windows-gnu", ] - [[package]] +-[[package]] -name = "winapi-build" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" - --[[package]] + [[package]] name = "winapi-i686-pc-windows-gnu" version = "0.4.0" - source = "registry+https://github.com/rust-lang/crates.io-index" -@@ -2137,7 +2275,7 @@ +@@ -2137,7 +2267,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ @@ -2871,7 +2904,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg ] [[package]] -@@ -2147,28 +2285,96 @@ +@@ -2147,27 +2277,95 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] @@ -2934,7 +2967,7 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg + "windows_x86_64_msvc", ] - [[package]] ++[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2976,7 +3009,32 @@ diff --unified --recursive --text mdbook-rss.orig/Cargo.lock mdbook-rss.new/Carg +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + -+[[package]] + [[package]] name = "yaml-rust" version = "0.4.5" - source = "registry+https://github.com/rust-lang/crates.io-index" +diff --git a/Cargo.toml b/Cargo.toml +index e06c7a6..1f97140 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -20,7 +20,7 @@ getset = "0.1.1" + globset = "0.4.6" + gray_matter = "0.1.0" + log = "0.4.14" +-markdown = "0.3.0" ++markdown = "1.0.0-alpha.7" + mdbook = "0.4.7" + rss = "1.10.0" + serde = "1.0.123" +diff --git a/src/feed.rs b/src/feed.rs +index c124b6a..26f1af5 100644 +--- a/src/feed.rs ++++ b/src/feed.rs +@@ -97,7 +97,7 @@ pub(super) fn item(book_item: &mut BookItem, config: &RssConfig) -> Result<Item, + Ok(url) => url, + Err(e) => anyhow::bail!(e), + }; +- let chapter_content_html = markdown::to_html(&markdown_without_front_matter); ++ let chapter_content_html = markdown::to_html_with_options(&markdown_without_front_matter, &markdown::Options::gfm()).unwrap(); + let author = config.author().to_owned(); + let rss_item = match ItemBuilder::default() + .title(chapter_name) |