From b8ce63e3f25948d90e1008d772b8fdc9f4d6d532 Mon Sep 17 00:00:00 2001 From: Dominik Werder Date: Wed, 18 Jun 2025 13:27:45 +0200 Subject: [PATCH] Update deps --- .cargo/cargo-lock | 225 ++++++++++++++++++++-------------------- batchtools/Cargo.toml | 2 +- daqingest/Cargo.toml | 4 +- dbpg/Cargo.toml | 2 +- ingest-linux/Cargo.toml | 2 +- mrucache/Cargo.toml | 2 +- netfetch/Cargo.toml | 2 +- scywr/Cargo.toml | 2 +- serieswriter/Cargo.toml | 2 +- stats/Cargo.toml | 2 +- 10 files changed, 122 insertions(+), 123 deletions(-) diff --git a/.cargo/cargo-lock b/.cargo/cargo-lock index d847c4b..1cf1d19 100644 --- a/.cargo/cargo-lock +++ b/.cargo/cargo-lock @@ -13,9 +13,9 @@ dependencies = [ [[package]] name = "adler2" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "ahash" @@ -61,9 +61,9 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.18" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b" +checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933" dependencies = [ "anstyle", "anstyle-parse", @@ -76,33 +76,33 @@ dependencies = [ [[package]] name = "anstyle" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9" +checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd" [[package]] name = "anstyle-parse" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c" +checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9" dependencies = [ "windows-sys 0.59.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.8" +version = "3.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6680de5231bd6ee4c6191b8a1325daa282b415391ec9d3a37bd34f2060dc73fa" +checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882" dependencies = [ "anstyle", "once_cell_polyfill", @@ -161,9 +161,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" +checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "autoerr" @@ -266,7 +266,7 @@ version = "0.0.2" dependencies = [ "async-channel", "daqbuf-err", - "log 0.0.2", + "daqbuf-log", "taskrun", ] @@ -296,9 +296,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.17.0" +version = "3.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" +checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee" [[package]] name = "byteorder" @@ -314,18 +314,18 @@ checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a" [[package]] name = "cc" -version = "1.2.25" +version = "1.2.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0fc897dc1e865cc67c0e05a836d9d3f1df3cbe442aa4a9473b18e12624a4951" +checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc" dependencies = [ "shlex", ] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" [[package]] name = "chrono" @@ -371,9 +371,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.39" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd60e63e9be68e5fb56422e397cf9baddded06dae1d2e523401542383bc72a9f" +checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f" dependencies = [ "clap_builder", "clap_derive", @@ -381,9 +381,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.39" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89cc6392a1f72bbeb820d71f32108f61fdaf18bc526e1d23954168a67759ef51" +checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e" dependencies = [ "anstream", "anstyle", @@ -393,9 +393,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.32" +version = "4.5.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7" +checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce" dependencies = [ "heck", "proc-macro2", @@ -405,9 +405,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.7.4" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6" +checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675" [[package]] name = "cobs" @@ -417,9 +417,9 @@ checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" [[package]] name = "colorchoice" -version = "1.0.3" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990" +checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" [[package]] name = "concurrent-queue" @@ -564,6 +564,7 @@ dependencies = [ "futures-util", "serde", "serde_json", + "time", "typetag", ] @@ -601,6 +602,14 @@ dependencies = [ "syn", ] +[[package]] +name = "daqbuf-log" +version = "0.0.2" +dependencies = [ + "time", + "tracing", +] + [[package]] name = "daqbuf-netpod" version = "0.0.4" @@ -713,6 +722,7 @@ dependencies = [ "http-body-util", "humantime", "itertools 0.13.0", + "kanal", "pin-project", "rand_xoshiro 0.6.0", "serde", @@ -723,7 +733,7 @@ dependencies = [ [[package]] name = "daqingest" -version = "0.3.0-aa.5" +version = "0.3.0-aa.8" dependencies = [ "async-channel", "autoerr", @@ -732,13 +742,13 @@ dependencies = [ "clap", "daqbuf-channeltools", "daqbuf-err", + "daqbuf-log", "daqbuf-netpod", "daqbuf-series", "dbpg", "futures-util", "ingest-linux", "libc", - "log 0.0.2", "netfetch", "scywr", "serde", @@ -820,10 +830,10 @@ dependencies = [ "batchtools", "chrono", "daqbuf-err", + "daqbuf-log", "daqbuf-netpod", "daqbuf-series", "futures-util", - "log 0.0.2", "md-5", "serde", "serde_json", @@ -1053,7 +1063,7 @@ checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592" dependencies = [ "cfg-if", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi 0.11.1+wasi-snapshot-preview1", ] [[package]] @@ -1111,9 +1121,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.15.3" +version = "0.15.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84b26c544d002229e640969970a2e74021aadf6e2f96372b9c58eff97de08eb3" +checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5" dependencies = [ "allocator-api2", "equivalent", @@ -1244,9 +1254,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1c293b6b3d21eca78250dc7dbebd6b9210ec5530e038cbfe0661b5c47ab06e8" +checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb" dependencies = [ "bytes", "futures-core", @@ -1268,7 +1278,7 @@ dependencies = [ "core-foundation-sys", "iana-time-zone-haiku", "js-sys", - "log 0.4.27", + "log", "wasm-bindgen", "windows-core", ] @@ -1402,7 +1412,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e" dependencies = [ "equivalent", - "hashbrown 0.15.3", + "hashbrown 0.15.4", ] [[package]] @@ -1410,8 +1420,8 @@ name = "ingest-linux" version = "0.0.1" dependencies = [ "autoerr", + "daqbuf-log", "libc", - "log 0.0.2", "taskrun", ] @@ -1464,6 +1474,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "kanal" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e3953adf0cd667798b396c2fa13552d6d9b3269d7dd1154c4c416442d1ff574" +dependencies = [ + "futures-core", + "lock_api", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -1472,9 +1492,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.172" +version = "0.2.174" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" +checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" [[package]] name = "litemap" @@ -1492,13 +1512,6 @@ dependencies = [ "scopeguard", ] -[[package]] -name = "log" -version = "0.0.2" -dependencies = [ - "tracing", -] - [[package]] name = "log" version = "0.4.27" @@ -1507,9 +1520,9 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "lz4_flex" -version = "0.11.3" +version = "0.11.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75761162ae2b0e580d7e7c390558127e5f01b4194debd6221fd8c207fc80e3f5" +checksum = "2c592ad9fbc1b7838633b3ae55ce69b17d01150c72fcef229fbb819d39ee51ee" dependencies = [ "twox-hash", ] @@ -1532,9 +1545,9 @@ dependencies = [ [[package]] name = "memchr" -version = "2.7.4" +version = "2.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" +checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0" [[package]] name = "mettrics" @@ -1571,9 +1584,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.8.8" +version = "0.8.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", ] @@ -1585,7 +1598,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c" dependencies = [ "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi 0.11.1+wasi-snapshot-preview1", "windows-sys 0.59.0", ] @@ -1593,8 +1606,8 @@ dependencies = [ name = "mrucache" version = "0.0.1" dependencies = [ - "hashbrown 0.15.3", - "log 0.0.2", + "daqbuf-log", + "hashbrown 0.15.4", ] [[package]] @@ -1615,6 +1628,7 @@ dependencies = [ "daqbuf-err", "daqbuf-items-0", "daqbuf-items-2", + "daqbuf-log", "daqbuf-netpod", "daqbuf-serde-helper", "daqbuf-series", @@ -1622,7 +1636,7 @@ dependencies = [ "dashmap 6.1.0", "dbpg", "futures-util", - "hashbrown 0.15.3", + "hashbrown 0.15.4", "hex", "http-body", "humantime", @@ -1630,7 +1644,6 @@ dependencies = [ "ingest-linux", "lazy_static", "libc", - "log 0.0.2", "md-5", "mrucache", "pin-project", @@ -1875,9 +1888,9 @@ dependencies = [ [[package]] name = "prettyplease" -version = "0.2.33" +version = "0.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dee91521343f4c5c6a63edd65e54f31f5c92fe8978c40a4282f8372194c6a7d" +checksum = "6837b9e10d61f45f987d50808f83d1ee3d206c66acf650c3e4ae2e1f6ddedf55" dependencies = [ "proc-macro2", "syn", @@ -1903,9 +1916,9 @@ dependencies = [ [[package]] name = "r-efi" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" [[package]] name = "rand" @@ -2004,9 +2017,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af" +checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6" dependencies = [ "bitflags", ] @@ -2064,9 +2077,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.24" +version = "0.1.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" +checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f" [[package]] name = "rustc_version" @@ -2221,11 +2234,11 @@ dependencies = [ "async-channel", "autoerr", "bytes", + "daqbuf-log", "daqbuf-netpod", "daqbuf-scydb", "daqbuf-series", "futures-util", - "log 0.0.2", "pin-project", "scylla 1.2.0", "serde", @@ -2325,12 +2338,12 @@ dependencies = [ "autoerr", "daqbuf-items-0", "daqbuf-items-2", + "daqbuf-log", "daqbuf-netpod", "daqbuf-series", "dbpg", "futures-util", "itertools 0.14.0", - "log 0.0.2", "scywr", "serde", "smallvec", @@ -2381,12 +2394,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d" [[package]] name = "slab" -version = "0.4.9" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" -dependencies = [ - "autocfg", -] +checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d" [[package]] name = "slidebuf" @@ -2399,9 +2409,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.15.0" +version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9" +checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] name = "snap" @@ -2434,18 +2444,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "stats" version = "0.0.1-a.0" dependencies = [ "daqbuf-ca-proto", - "log 0.0.2", + "daqbuf-log", "mettrics", "rand_xoshiro 0.7.0", "serde", @@ -2494,9 +2498,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.101" +version = "2.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf" +checksum = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8" dependencies = [ "proc-macro2", "quote", @@ -2557,12 +2561,11 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.8" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" dependencies = [ "cfg-if", - "once_cell", ] [[package]] @@ -2663,7 +2666,7 @@ dependencies = [ "fallible-iterator", "futures-channel", "futures-util", - "log 0.4.27", + "log", "parking_lot", "percent-encoding", "phf", @@ -2735,7 +2738,7 @@ version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0" dependencies = [ - "log 0.4.27", + "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -2743,9 +2746,9 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.28" +version = "0.1.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d" +checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903" dependencies = [ "proc-macro2", "quote", @@ -2754,9 +2757,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.33" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c" +checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678" dependencies = [ "once_cell", "valuable", @@ -2768,7 +2771,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" dependencies = [ - "log 0.4.27", + "log", "once_cell", "tracing-core", ] @@ -2790,13 +2793,9 @@ dependencies = [ [[package]] name = "twox-hash" -version = "1.6.3" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" -dependencies = [ - "cfg-if", - "static_assertions", -] +checksum = "8b907da542cbced5261bd3256de1b3a1bf340a3d37f93425a07362a1d687de56" [[package]] name = "typeid" @@ -2915,9 +2914,9 @@ checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" [[package]] name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" +version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasi" @@ -2953,7 +2952,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", - "log 0.4.27", + "log", "proc-macro2", "quote", "syn", @@ -3072,9 +3071,9 @@ dependencies = [ [[package]] name = "windows-link" -version = "0.1.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" +checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a" [[package]] name = "windows-result" @@ -3241,18 +3240,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.25" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb" +checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.25" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef" +checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181" dependencies = [ "proc-macro2", "quote", diff --git a/batchtools/Cargo.toml b/batchtools/Cargo.toml index b0134ba..dfd8c81 100644 --- a/batchtools/Cargo.toml +++ b/batchtools/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" doctest = false [dependencies] -log = { path = "../../daqbuf-log", package = "log" } +log = { path = "../../daqbuf-log", package = "daqbuf-log" } err = { path = "../../daqbuf-err", package = "daqbuf-err" } taskrun = { path = "../../daqbuffer/crates/taskrun" } async-channel = "2.1.0" diff --git a/daqingest/Cargo.toml b/daqingest/Cargo.toml index 9d817e7..749e8e2 100644 --- a/daqingest/Cargo.toml +++ b/daqingest/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "daqingest" -version = "0.3.0-aa.7" +version = "0.3.0-aa.8" authors = ["Dominik Werder "] edition = "2024" @@ -26,7 +26,7 @@ netpod = { path = "../../daqbuf-netpod", package = "daqbuf-netpod" } taskrun = { path = "../../daqbuffer/crates/taskrun" } series = { path = "../../daqbuf-series", package = "daqbuf-series" } channeltools = { path = "../../daqbuf-channeltools", package = "daqbuf-channeltools" } -log = { path = "../../daqbuf-log", package = "log" } +log = { path = "../../daqbuf-log", package = "daqbuf-log" } stats = { path = "../stats" } scywr = { path = "../scywr" } dbpg = { path = "../dbpg" } diff --git a/dbpg/Cargo.toml b/dbpg/Cargo.toml index b6ffd09..4140812 100644 --- a/dbpg/Cargo.toml +++ b/dbpg/Cargo.toml @@ -8,7 +8,7 @@ edition = "2024" doctest = false [dependencies] -log = { path = "../../daqbuf-log", package = "log" } +log = { path = "../../daqbuf-log", package = "daqbuf-log" } err = { path = "../../daqbuf-err", package = "daqbuf-err" } netpod = { path = "../../daqbuf-netpod", package = "daqbuf-netpod" } taskrun = { path = "../../daqbuffer/crates/taskrun" } diff --git a/ingest-linux/Cargo.toml b/ingest-linux/Cargo.toml index e98b2c4..3e884f0 100644 --- a/ingest-linux/Cargo.toml +++ b/ingest-linux/Cargo.toml @@ -7,5 +7,5 @@ edition = "2024" [dependencies] libc = "0.2" autoerr = "0.0" -log = { path = "../../daqbuf-log", package = "log" } +log = { path = "../../daqbuf-log", package = "daqbuf-log" } taskrun = { path = "../../daqbuffer/crates/taskrun" } diff --git a/mrucache/Cargo.toml b/mrucache/Cargo.toml index a306a15..585f892 100644 --- a/mrucache/Cargo.toml +++ b/mrucache/Cargo.toml @@ -6,4 +6,4 @@ authors = ["Dominik Werder "] [dependencies] hashbrown = "0.15.2" -log = { path = "../../daqbuf-log", package = "log" } +log = { path = "../../daqbuf-log", package = "daqbuf-log" } diff --git a/netfetch/Cargo.toml b/netfetch/Cargo.toml index 902752c..3512fed 100644 --- a/netfetch/Cargo.toml +++ b/netfetch/Cargo.toml @@ -38,7 +38,7 @@ dashmap = "6.0.1" hashbrown = "0.15.2" smallvec = "1.13.2" autoerr = "0.0" -log = { path = "../../daqbuf-log", package = "log" } +log = { path = "../../daqbuf-log", package = "daqbuf-log" } series = { path = "../../daqbuf-series", package = "daqbuf-series" } serieswriter = { path = "../serieswriter" } stats = { path = "../stats" } diff --git a/scywr/Cargo.toml b/scywr/Cargo.toml index f56da13..8dd2e44 100644 --- a/scywr/Cargo.toml +++ b/scywr/Cargo.toml @@ -13,7 +13,7 @@ pin-project = "1.1.5" bytes = "1.10.0" autoerr = "0.0" serde = { version = "1", features = ["derive"] } -log = { path = "../../daqbuf-log", package = "log" } +log = { path = "../../daqbuf-log", package = "daqbuf-log" } stats = { path = "../stats" } series = { path = "../../daqbuf-series", package = "daqbuf-series" } netpod = { path = "../../daqbuf-netpod", package = "daqbuf-netpod" } diff --git a/serieswriter/Cargo.toml b/serieswriter/Cargo.toml index c645837..6b58bfb 100644 --- a/serieswriter/Cargo.toml +++ b/serieswriter/Cargo.toml @@ -11,7 +11,7 @@ futures-util = "0.3.30" smallvec = "1.13.2" autoerr = "0.0" itertools = "0.14" -log = { path = "../../daqbuf-log", package = "log" } +log = { path = "../../daqbuf-log", package = "daqbuf-log" } netpod = { path = "../../daqbuf-netpod", package = "daqbuf-netpod" } items_0 = { path = "../../daqbuf-items-0", package = "daqbuf-items-0" } items_2 = { path = "../../daqbuf-items-2", package = "daqbuf-items-2" } diff --git a/stats/Cargo.toml b/stats/Cargo.toml index 06e0f25..489b5b8 100644 --- a/stats/Cargo.toml +++ b/stats/Cargo.toml @@ -12,6 +12,6 @@ serde = { version = "1", features = ["derive"] } rand_xoshiro = "0.7.0" stats_types = { path = "../stats_types" } stats_proc = { path = "../stats_proc" } -log = { path = "../../daqbuf-log", package = "log" } +log = { path = "../../daqbuf-log", package = "daqbuf-log" } mettrics = { version = "0.0.7", path = "../../mettrics" } ca_proto = { path = "../../daqbuf-ca-proto", package = "daqbuf-ca-proto" }