diff --git a/Cargo.lock b/Cargo.lock index 464d6b0..aac2973 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -179,9 +179,9 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "axum" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a6c9af12842a67734c9a2e355436e5d03b22383ed60cf13cd0c18fbfe3dcbcf" +checksum = "8f43644eed690f5374f1af436ecd6aea01cd201f6fbdf0178adaf6907afb2cec" dependencies = [ "async-trait", "axum-core", @@ -205,7 +205,7 @@ dependencies = [ "serde_urlencoded", "sync_wrapper 1.0.1", "tokio", - "tower 0.4.13", + "tower 0.5.1", "tower-layer", "tower-service", "tracing", @@ -213,9 +213,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15c63fd72d41492dc4f497196f5da1fb04fb7529e631d73630d1b491e47a2e3" +checksum = "5e6b8ba012a258d63c9adfa28b9ddcf66149da6f986c5b5452e629d5ee64bf00" dependencies = [ "async-trait", "bytes", @@ -226,7 +226,7 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 0.1.2", + "sync_wrapper 1.0.1", "tower-layer", "tower-service", "tracing", @@ -317,7 +317,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" dependencies = [ "memchr", - "regex-automata", + "regex-automata 0.4.7", "serde", ] @@ -1128,8 +1128,8 @@ dependencies = [ "aho-corasick", "bstr", "log", - "regex-automata", - "regex-syntax", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", ] [[package]] @@ -1344,7 +1344,7 @@ dependencies = [ "globset", "log", "memchr", - "regex-automata", + "regex-automata 0.4.7", "same-file", "walkdir", "winapi-util", @@ -1558,6 +1558,15 @@ version = "0.4.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "matchit" version = "0.7.3" @@ -1712,6 +1721,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-conv" version = "0.1.0" @@ -1801,6 +1820,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "parking_lot" version = "0.12.3" @@ -2200,8 +2225,17 @@ checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax", + "regex-automata 0.4.7", + "regex-syntax 0.8.4", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", ] [[package]] @@ -2212,9 +2246,15 @@ checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.4", ] +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + [[package]] name = "regex-syntax" version = "0.8.4" @@ -2546,6 +2586,15 @@ dependencies = [ "digest", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "signal-hook-registry" version = "1.4.2" @@ -2672,11 +2721,23 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" +[[package]] +name = "tar" +version = "0.4.41" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +dependencies = [ + "filetime", + "libc", + "xattr", +] + [[package]] name = "tectonic" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ + "anyhow", "byte-unit", "cfg-if", "clap", @@ -2689,7 +2750,9 @@ dependencies = [ "md-5", "open", "quick-xml", + "regex", "sha2", + "tar", "tectonic_bridge_core", "tectonic_bundles", "tectonic_engine_bibtex", @@ -2706,7 +2769,10 @@ dependencies = [ "termcolor", "time", "tokio", + "tracing", + "tracing-subscriber", "url", + "walkdir", "watchexec", "watchexec-filterer-globset", "watchexec-signals", @@ -2732,7 +2798,7 @@ dependencies = [ [[package]] name = "tectonic_bridge_core" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "cc", "flate2", @@ -2747,7 +2813,7 @@ dependencies = [ [[package]] name = "tectonic_bridge_flate" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "flate2", "libc", @@ -2756,7 +2822,7 @@ dependencies = [ [[package]] name = "tectonic_bridge_freetype2" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "tectonic_dep_support", ] @@ -2764,7 +2830,7 @@ dependencies = [ [[package]] name = "tectonic_bridge_graphite2" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "tectonic_dep_support", ] @@ -2772,7 +2838,7 @@ dependencies = [ [[package]] name = "tectonic_bridge_harfbuzz" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "cc", "tectonic_bridge_graphite2", @@ -2782,7 +2848,7 @@ dependencies = [ [[package]] name = "tectonic_bridge_icu" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "tectonic_dep_support", ] @@ -2790,7 +2856,7 @@ dependencies = [ [[package]] name = "tectonic_bundles" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "flate2", "fs2", @@ -2798,13 +2864,14 @@ dependencies = [ "tectonic_geturl", "tectonic_io_base", "tectonic_status_base", + "url", "zip 0.6.6", ] [[package]] name = "tectonic_cfg_support" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "lazy_static", ] @@ -2812,7 +2879,7 @@ dependencies = [ [[package]] name = "tectonic_dep_support" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "pkg-config", "vcpkg", @@ -2821,7 +2888,7 @@ dependencies = [ [[package]] name = "tectonic_engine_bibtex" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "libc", "tectonic_bridge_core", @@ -2832,7 +2899,7 @@ dependencies = [ [[package]] name = "tectonic_engine_spx2html" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "byteorder", "html-escape", @@ -2852,7 +2919,7 @@ dependencies = [ [[package]] name = "tectonic_engine_xdvipdfmx" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "cc", "libc", @@ -2864,7 +2931,7 @@ dependencies = [ [[package]] name = "tectonic_engine_xetex" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "cc", "libc", @@ -2881,7 +2948,7 @@ dependencies = [ [[package]] name = "tectonic_errors" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "anyhow", ] @@ -2889,7 +2956,7 @@ dependencies = [ [[package]] name = "tectonic_geturl" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "cfg-if", "curl", @@ -2900,7 +2967,7 @@ dependencies = [ [[package]] name = "tectonic_io_base" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "app_dirs2", "flate2", @@ -2914,7 +2981,7 @@ dependencies = [ [[package]] name = "tectonic_pdf_io" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "cc", "tectonic_bridge_core", @@ -2926,7 +2993,7 @@ dependencies = [ [[package]] name = "tectonic_status_base" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "tectonic_errors", ] @@ -2934,7 +3001,7 @@ dependencies = [ [[package]] name = "tectonic_xdv" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "byteorder", ] @@ -2942,7 +3009,7 @@ dependencies = [ [[package]] name = "tectonic_xetex_layout" version = "0.0.0-dev.0" -source = "git+https://github.com/tectonic-typesetting/tectonic.git#78c53c07e1ff481ef16dc22eb97630c165618f1d" +source = "git+https://github.com/tectonic-typesetting/tectonic.git#51e179f7428cf00669ae4751ce59f10b4accdd05" dependencies = [ "cc", "tectonic_bridge_core", @@ -3017,6 +3084,16 @@ dependencies = [ "syn 2.0.68", ] +[[package]] +name = "thread_local" +version = "1.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +dependencies = [ + "cfg-if", + "once_cell", +] + [[package]] name = "time" version = "0.3.36" @@ -3146,7 +3223,6 @@ dependencies = [ "tokio", "tower-layer", "tower-service", - "tracing", ] [[package]] @@ -3155,8 +3231,14 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper 0.1.2", + "tokio", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -3216,6 +3298,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", ] [[package]] @@ -3438,6 +3550,12 @@ version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5de17fd2f7da591098415cff336e12965a28061ddace43b59cb3c430179c9439" +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" @@ -3926,6 +4044,17 @@ dependencies = [ "tap", ] +[[package]] +name = "xattr" +version = "1.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" +dependencies = [ + "libc", + "linux-raw-sys", + "rustix", +] + [[package]] name = "xdg" version = "2.5.2" diff --git a/Cargo.toml b/Cargo.toml index cbe9b75..ca6733c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ version = "0.1.0" edition = "2021" [dependencies] -axum = "0.7.5" +axum = "0.7.6" serde = { version = "1.0.210", features = ["derive"] } serde_json = "1.0.128" tokio = { version = "1.40.0", features = ["full"] }