diff --git a/Cargo.lock b/Cargo.lock index dae738f4..5a7f967b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3,10 +3,10 @@ version = 3 [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627" [[package]] name = "aho-corasick" @@ -25,9 +25,9 @@ checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" [[package]] name = "anyhow" -version = "1.0.86" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" [[package]] name = "atty" @@ -42,9 +42,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "base64" @@ -87,13 +87,13 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bstr" -version = "0.2.17" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba3569f383e8f1598449f1a423e72e99569137b47740b1da11ef19af3d5c3223" +checksum = "1a68f1f47cdf0ec8ee4b941b2eee2a80cb796db73118c0dd09ac63fbe405be22" dependencies = [ - "lazy_static", "memchr", - "regex-automata 0.1.10", + "regex-automata", + "serde", ] [[package]] @@ -102,11 +102,17 @@ version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" + [[package]] name = "bytes" -version = "1.6.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "325918d6fe32f23b19878fe4b34794ae41fc19ddbe53b10571a4874d44ffd39b" [[package]] name = "cast" @@ -116,9 +122,12 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.0.106" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "066fce287b1d4eafef758e89e09d724a24808a9196fe9756b8ca90e86d0719a2" +checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc" +dependencies = [ + "shlex", +] [[package]] name = "cfg-if" @@ -183,7 +192,7 @@ dependencies = [ "encode_unicode", "lazy_static", "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -295,30 +304,30 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.9" +version = "0.3.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" +checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] name = "fastrand" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" +checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4" [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys", + "libredox", + "windows-sys 0.59.0", ] [[package]] @@ -329,9 +338,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flate2" -version = "1.0.30" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" +checksum = "c936bfdafb507ebbf50b8074c54fa31c5be9a1e7e5f467dd659697041407d07c" dependencies = [ "crc32fast", "miniz_oxide", @@ -387,9 +396,9 @@ checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289" [[package]] name = "heck" @@ -408,9 +417,9 @@ dependencies = [ [[package]] name = "hermit-abi" -version = "0.3.9" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024" +checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc" [[package]] name = "humantime" @@ -440,19 +449,19 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.2.6" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" +checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" dependencies = [ "equivalent", - "hashbrown 0.14.5", + "hashbrown 0.15.2", ] [[package]] name = "insta" -version = "1.39.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5" +checksum = "7e9ffc4d4892617c50a928c52b2961cb5174b6fc6ebf252b2fac9d21955c48b8" dependencies = [ "console", "lazy_static", @@ -463,13 +472,13 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.12" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" +checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b" dependencies = [ - "hermit-abi 0.3.9", + "hermit-abi 0.4.0", "libc", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] @@ -483,16 +492,17 @@ dependencies = [ [[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.69" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" +checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705" dependencies = [ + "once_cell", "wasm-bindgen", ] @@ -504,15 +514,26 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.155" +version = "0.2.167" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" +checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc" [[package]] name = "libm" -version = "0.2.8" +version = "0.2.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" + +[[package]] +name = "libredox" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec2a862134d2a7d32d7983ddcdd1c4923530833c9f2ea1a44fc5fa473989058" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" +dependencies = [ + "bitflags 2.6.0", + "libc", + "redox_syscall", +] [[package]] name = "linked-hash-map" @@ -553,7 +574,7 @@ dependencies = [ "proc-macro2", "quote", "regex-syntax", - "syn 2.0.70", + "syn 2.0.90", ] [[package]] @@ -573,9 +594,9 @@ checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "miette" -version = "7.2.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4edc8853320c2a0dab800fbda86253c8938f6ea88510dc92c5f1ed20e794afc1" +checksum = "317f146e2eb7021892722af37cf1b971f0a70c8406f487e24952667616192c64" dependencies = [ "cfg-if", "miette-derive", @@ -585,22 +606,22 @@ dependencies = [ [[package]] name = "miette-derive" -version = "7.2.0" +version = "7.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" +checksum = "23c9b935fbe1d6cbd1dac857b54a688145e2d93f48db36010514d0f612d0ad67" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.90", ] [[package]] name = "miniz_oxide" -version = "0.7.4" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" +checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ - "adler", + "adler2", ] [[package]] @@ -621,9 +642,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.19.0" +version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" +checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" [[package]] name = "oorandom" @@ -659,14 +680,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ "fixedbitset", - "indexmap 2.2.6", + "indexmap 2.7.0", ] [[package]] name = "plotters" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a15b6eccb8484002195a3e44fe65a4ce8e93a625797a063735536fd59cb01cf3" +checksum = "5aeb6f403d7a4911efb1e33402027fc44f29b5bf6def3effcc22d7bb75f2b747" dependencies = [ "num-traits", "plotters-backend", @@ -677,40 +698,43 @@ dependencies = [ [[package]] name = "plotters-backend" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "414cec62c6634ae900ea1c56128dfe87cf63e7caece0852ec76aba307cebadb7" +checksum = "df42e13c12958a16b3f7f4386b9ab1f3e7933914ecea48da7139435263a4172a" [[package]] name = "plotters-svg" -version = "0.3.6" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81b30686a7d9c3e010b84284bdd26a29f2138574f52f5eb6f794fc0ad924e705" +checksum = "51bae2ac328883f7acdfea3d66a7c35751187f870bc81f94563733a154d7a670" dependencies = [ "plotters-backend", ] [[package]] name = "ppv-lite86" -version = "0.2.17" +version = "0.2.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04" +dependencies = [ + "zerocopy", +] [[package]] name = "prettyplease" -version = "0.2.20" +version = "0.2.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" +checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033" dependencies = [ "proc-macro2", - "syn 2.0.70", + "syn 2.0.90", ] [[package]] name = "proc-macro2" -version = "1.0.86" +version = "1.0.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" +checksum = "37d3544b3f2748c54e147655edb5025752e2303145b5aefb3c3ea2c78b973bb0" dependencies = [ "unicode-ident", ] @@ -748,9 +772,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac47baaef3631368888abc13a62cb6d42b88bfd5c3fc6f920a9cbe4d7d3ddc9d" +checksum = "3b2ecbe40f08db5c006b5764a2645f7f3f141ce756412ac9e1dd6087e6d32995" dependencies = [ "bytes", "prost-derive", @@ -758,9 +782,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04952a6dc0bf60a696e83fc8c58e912d4f6c1d06c6637db44c1cce9c6735c920" +checksum = "f8650aabb6c35b860610e9cff5dc1af886c9e25073b7b1712a68972af4281302" dependencies = [ "bytes", "heck", @@ -773,21 +797,21 @@ dependencies = [ "prost", "prost-types", "regex", - "syn 2.0.70", + "syn 2.0.90", "tempfile", ] [[package]] name = "prost-derive" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5834058badd2cf6cfcd9c92998ceb2bab614f012cccf3728de3edf2c57b9132" +checksum = "acf0c195eebb4af52c752bec4f52f645da98b6e92077a04110c7f349477ae5ac" dependencies = [ "anyhow", "itertools", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.90", ] [[package]] @@ -849,7 +873,7 @@ dependencies = [ "prost", "prost-reflect", "quote", - "syn 2.0.70", + "syn 2.0.90", "trybuild", ] @@ -873,18 +897,18 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.13.0" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c1964ef64b94480df8c92ae14e5764d470014ad951d2f99e5a6c0c7712710c" +checksum = "60caa6738c7369b940c3d49246a8d1749323674c65cb13010134f5c9bad5b519" dependencies = [ "prost", ] [[package]] name = "protox" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70cdc4ca5487c1fddc30fa2bebba28c0f250f80c944190652ccaaeb157349175" +checksum = "873f359bdecdfe6e353752f97cb9ee69368df55b16363ed2216da85e03232a58" dependencies = [ "bytes", "miette", @@ -915,9 +939,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -983,36 +1007,30 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] name = "regex" -version = "1.10.5" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" +checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", + "regex-automata", "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" - -[[package]] -name = "regex-automata" -version = "0.4.7" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908" dependencies = [ "aho-corasick", "memchr", @@ -1021,9 +1039,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "ring" @@ -1037,27 +1055,27 @@ dependencies = [ "libc", "spin", "untrusted", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustix" -version = "0.38.34" +version = "0.38.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" +checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6" dependencies = [ "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.23.11" +version = "0.23.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" +checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1" dependencies = [ "log", "once_cell", @@ -1070,15 +1088,15 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.7.0" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" +checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b" [[package]] name = "rustls-webpki" -version = "0.102.5" +version = "0.102.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" +checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9" dependencies = [ "ring", "rustls-pki-types", @@ -1114,9 +1132,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.204" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] @@ -1133,31 +1151,32 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.204" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.90", ] [[package]] name = "serde_json" -version = "1.0.120" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] [[package]] name = "serde_spanned" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -1168,18 +1187,24 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "itoa", "ryu", "serde", "unsafe-libyaml", ] +[[package]] +name = "shlex" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" + [[package]] name = "similar" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640" +checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e" dependencies = [ "bstr", "unicode-segmentation", @@ -1187,9 +1212,9 @@ dependencies = [ [[package]] name = "similar-asserts" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e041bb827d1bfca18f213411d51b665309f1afb37a04a5d1464530e13779fc0f" +checksum = "cfe85670573cd6f0fa97940f26e7e6601213c3b0555246c24234131f88c5709e" dependencies = [ "console", "serde", @@ -1221,9 +1246,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.70" +version = "2.0.90" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" +checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31" dependencies = [ "proc-macro2", "quote", @@ -1232,25 +1257,32 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.41" +version = "0.4.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "c65998313f8e17d0d553d28f91a0df93e4dbbbf770279c7bc21ca0f09ea1a1f6" dependencies = [ "filetime", "libc", "xattr", ] +[[package]] +name = "target-triple" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42a4d50cdb458045afc8131fd91b64904da29548bcb63c7236e0844936c13078" + [[package]] name = "tempfile" -version = "3.10.1" +version = "3.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "28cce251fcbc87fac86a866eeb0d6c2d536fc16d06f184bb61aeae11aa4cee0c" dependencies = [ "cfg-if", "fastrand", + "once_cell", "rustix", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -1270,22 +1302,22 @@ checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" [[package]] name = "thiserror" -version = "1.0.61" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.61" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.90", ] [[package]] @@ -1315,9 +1347,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "toml" -version = "0.8.14" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", @@ -1327,20 +1359,20 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.6.6" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.2.6", + "indexmap 2.7.0", "serde", "serde_spanned", "toml_datetime", @@ -1349,14 +1381,15 @@ dependencies = [ [[package]] name = "trybuild" -version = "1.0.97" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b1e5645f2ee8025c2f1d75e1138f2dd034d74e6ba54620f3c569ba2a2a1ea06" +checksum = "8dcd332a5496c026f1e14b7f3d2b7bd98e509660c04239c58b0ba38a12daded4" dependencies = [ "glob", "serde", "serde_derive", "serde_json", + "target-triple", "termcolor", "toml", ] @@ -1369,36 +1402,36 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-bidi" -version = "0.3.15" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" +checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893" [[package]] name = "unicode-ident" -version = "1.0.12" +version = "1.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" +checksum = "adb9e6ca4f869e1180728b7950e35922a7fc6397f7b641499e8f3ef06e50dc83" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" +checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493" [[package]] name = "unicode-width" -version = "0.1.13" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unsafe-libyaml" @@ -1466,34 +1499,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.92" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" +checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c" dependencies = [ "cfg-if", + "once_cell", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.92" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" +checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.90", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-macro" -version = "0.2.92" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" +checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1501,28 +1535,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.92" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" +checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d" dependencies = [ "proc-macro2", "quote", - "syn 2.0.70", + "syn 2.0.90", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.92" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" +checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49" [[package]] name = "web-sys" -version = "0.3.69" +version = "0.3.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" +checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c" dependencies = [ "js-sys", "wasm-bindgen", @@ -1530,9 +1564,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.3" +version = "0.26.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +checksum = "5d642ff16b7e79272ae451b7322067cdc17cadf68c23264be9d94a32319efe7e" dependencies = [ "rustls-pki-types", ] @@ -1555,11 +1589,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" +checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -1577,6 +1611,15 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets", +] + [[package]] name = "windows-targets" version = "0.52.6" @@ -1643,9 +1686,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.13" +version = "0.6.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1" +checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b" dependencies = [ "memchr", ] @@ -1661,6 +1704,27 @@ dependencies = [ "rustix", ] +[[package]] +name = "zerocopy" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0" +dependencies = [ + "byteorder", + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.7.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "zeroize" version = "1.8.1" diff --git a/README.md b/README.md index 08c4b3d2..558f412e 100644 --- a/README.md +++ b/README.md @@ -102,7 +102,7 @@ prost_reflect_build::Builder::new() ## Minimum Supported Rust Version -Rust **1.64** or higher. +Rust **1.70** or higher. The minimum supported Rust version may be changed in the future, but it will be done with a minor version bump. diff --git a/README.tpl b/README.tpl index 53957b4f..c58f0c2e 100644 --- a/README.tpl +++ b/README.tpl @@ -28,7 +28,7 @@ A protobuf library extending [`prost`](https://crates.io/crates/prost) with refl ## Minimum Supported Rust Version -Rust **1.64** or higher. +Rust **1.70** or higher. The minimum supported Rust version may be changed in the future, but it will be done with a minor version bump. diff --git a/prost-reflect/doc/file_descriptor_set.bin b/prost-reflect/doc/file_descriptor_set.bin new file mode 100644 index 00000000..8522e13b Binary files /dev/null and b/prost-reflect/doc/file_descriptor_set.bin differ diff --git a/prost-reflect/src/descriptor/api.rs b/prost-reflect/src/descriptor/api.rs index 01fce688..13e46a2a 100644 --- a/prost-reflect/src/descriptor/api.rs +++ b/prost-reflect/src/descriptor/api.rs @@ -338,13 +338,13 @@ impl DescriptorPool { files: &'a [FileDescriptorInner], } - impl<'a> fmt::Debug for FileDescriptorSet<'a> { + impl fmt::Debug for FileDescriptorSet<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.debug_struct("FileDescriptorSet").finish_non_exhaustive() } } - impl<'a> Message for FileDescriptorSet<'a> { + impl Message for FileDescriptorSet<'_> { fn encode_raw(&self, buf: &mut impl BufMut) where Self: Sized, diff --git a/prost-reflect/src/descriptor/build/names.rs b/prost-reflect/src/descriptor/build/names.rs index 2afe1434..e2fe5ffb 100644 --- a/prost-reflect/src/descriptor/build/names.rs +++ b/prost-reflect/src/descriptor/build/names.rs @@ -47,7 +47,7 @@ struct NameVisitor<'a> { errors: Vec, } -impl<'a> Visitor for NameVisitor<'a> { +impl Visitor for NameVisitor<'_> { fn visit_file(&mut self, path: &[i32], index: FileIndex, file: &FileDescriptorProto) { debug_assert_eq!(to_index(self.pool.files.len()), index); @@ -326,7 +326,7 @@ impl<'a> Visitor for NameVisitor<'a> { } } -impl<'a> NameVisitor<'a> { +impl NameVisitor<'_> { fn add_name( &mut self, file: FileIndex, diff --git a/prost-reflect/src/descriptor/build/options.rs b/prost-reflect/src/descriptor/build/options.rs index bb5fae83..81f467a7 100644 --- a/prost-reflect/src/descriptor/build/options.rs +++ b/prost-reflect/src/descriptor/build/options.rs @@ -74,7 +74,7 @@ struct OptionsVisitor<'a> { locations: Vec<(FileIndex, Box<[i32]>, Box<[i32]>)>, } -impl<'a> Visitor for OptionsVisitor<'a> { +impl Visitor for OptionsVisitor<'_> { fn visit_file(&mut self, path: &[i32], index: FileIndex, file: &FileDescriptorProto) { if let Some(options) = &file.options { let path = join_path(path, &[tag::file::OPTIONS]); @@ -296,7 +296,7 @@ impl<'a> Visitor for OptionsVisitor<'a> { } } -impl<'a> OptionsVisitor<'a> { +impl OptionsVisitor<'_> { fn resolve_options( &mut self, desc_name: &str, diff --git a/prost-reflect/src/descriptor/build/resolve.rs b/prost-reflect/src/descriptor/build/resolve.rs index 0248cd26..72a06537 100644 --- a/prost-reflect/src/descriptor/build/resolve.rs +++ b/prost-reflect/src/descriptor/build/resolve.rs @@ -49,7 +49,7 @@ struct ResolveVisitor<'a> { errors: Vec, } -impl<'a> Visitor for ResolveVisitor<'a> { +impl Visitor for ResolveVisitor<'_> { fn visit_file(&mut self, path: &[i32], index: FileIndex, file: &FileDescriptorProto) { let mut transitive_dependencies = HashSet::with_capacity(file.dependency.len() + 1); transitive_dependencies.insert(index); @@ -414,7 +414,7 @@ impl<'a> Visitor for ResolveVisitor<'a> { } } -impl<'a> ResolveVisitor<'a> { +impl ResolveVisitor<'_> { fn resolve_public_dependencies(&self, dependencies: &mut HashSet, index: FileIndex) { let file = &self.pool.files[index as usize]; diff --git a/prost-reflect/src/descriptor/types.rs b/prost-reflect/src/descriptor/types.rs index f5ca064a..cdf8c617 100644 --- a/prost-reflect/src/descriptor/types.rs +++ b/prost-reflect/src/descriptor/types.rs @@ -545,7 +545,7 @@ where src: &'a mut B, } - impl<'a, B> Buf for CopyBufAdapter<'a, B> + impl Buf for CopyBufAdapter<'_, B> where B: Buf, { diff --git a/prost-reflect/src/dynamic/fields.rs b/prost-reflect/src/dynamic/fields.rs index 64c3a8ca..0ce39e05 100644 --- a/prost-reflect/src/dynamic/fields.rs +++ b/prost-reflect/src/dynamic/fields.rs @@ -146,7 +146,7 @@ impl DynamicMessageFieldSet { pub(crate) fn iter<'a>( &'a self, message: &'a MessageDescriptor, - ) -> impl Iterator + 'a { + ) -> impl Iterator> + 'a { self.fields .iter() .filter_map(move |(&number, value)| match value { @@ -179,7 +179,7 @@ impl DynamicMessageFieldSet { pub(crate) fn iter_include_default<'a>( &'a self, message: &'a MessageDescriptor, - ) -> impl Iterator + 'a { + ) -> impl Iterator> + 'a { let fields = message .fields() .filter(move |f| !f.supports_presence() || self.has(f)) diff --git a/prost-reflect/src/dynamic/serde/de/kind.rs b/prost-reflect/src/dynamic/serde/de/kind.rs index 9e9fee4c..2a6f57dc 100644 --- a/prost-reflect/src/dynamic/serde/de/kind.rs +++ b/prost-reflect/src/dynamic/serde/de/kind.rs @@ -14,7 +14,7 @@ use super::{ pub struct KindSeed<'a>(pub &'a Kind, pub &'a DeserializeOptions); -impl<'a, 'de> DeserializeSeed<'de> for KindSeed<'a> { +impl<'de> DeserializeSeed<'de> for KindSeed<'_> { type Value = Value; fn deserialize(self, deserializer: D) -> Result @@ -64,7 +64,7 @@ pub struct MessageVisitor<'a>(pub &'a MessageDescriptor, pub &'a DeserializeOpti pub struct MessageVisitorInner<'a>(pub &'a mut DynamicMessage, pub &'a DeserializeOptions); pub struct EnumVisitor<'a>(pub &'a EnumDescriptor); -impl<'a, 'de> Visitor<'de> for ListVisitor<'a> { +impl<'de> Visitor<'de> for ListVisitor<'_> { type Value = Vec; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -86,7 +86,7 @@ impl<'a, 'de> Visitor<'de> for ListVisitor<'a> { } } -impl<'a, 'de> Visitor<'de> for MapVisitor<'a> { +impl<'de> Visitor<'de> for MapVisitor<'_> { type Value = HashMap; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -133,7 +133,7 @@ impl<'a, 'de> Visitor<'de> for MapVisitor<'a> { } } -impl<'de> Visitor<'de> for DoubleVisitor { +impl Visitor<'_> for DoubleVisitor { type Value = f64; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -178,7 +178,7 @@ impl<'de> Visitor<'de> for DoubleVisitor { } } -impl<'de> Visitor<'de> for FloatVisitor { +impl Visitor<'_> for FloatVisitor { type Value = f32; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -235,7 +235,7 @@ impl<'de> Visitor<'de> for FloatVisitor { } } -impl<'de> Visitor<'de> for Int32Visitor { +impl Visitor<'_> for Int32Visitor { type Value = i32; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -290,7 +290,7 @@ impl<'de> Visitor<'de> for Int32Visitor { } } -impl<'de> Visitor<'de> for Uint32Visitor { +impl Visitor<'_> for Uint32Visitor { type Value = u32; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -345,7 +345,7 @@ impl<'de> Visitor<'de> for Uint32Visitor { } } -impl<'de> Visitor<'de> for Int64Visitor { +impl Visitor<'_> for Int64Visitor { type Value = i64; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -392,7 +392,7 @@ impl<'de> Visitor<'de> for Int64Visitor { } } -impl<'de> Visitor<'de> for Uint64Visitor { +impl Visitor<'_> for Uint64Visitor { type Value = u64; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -439,7 +439,7 @@ impl<'de> Visitor<'de> for Uint64Visitor { } } -impl<'de> Visitor<'de> for StringVisitor { +impl Visitor<'_> for StringVisitor { type Value = String; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -463,7 +463,7 @@ impl<'de> Visitor<'de> for StringVisitor { } } -impl<'de> Visitor<'de> for BoolVisitor { +impl Visitor<'_> for BoolVisitor { type Value = bool; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -479,7 +479,7 @@ impl<'de> Visitor<'de> for BoolVisitor { } } -impl<'de> Visitor<'de> for BytesVisitor { +impl Visitor<'_> for BytesVisitor { type Value = Bytes; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -519,7 +519,7 @@ impl<'de> Visitor<'de> for BytesVisitor { } } -impl<'a, 'de> Visitor<'de> for MessageVisitor<'a> { +impl<'de> Visitor<'de> for MessageVisitor<'_> { type Value = DynamicMessage; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -538,7 +538,7 @@ impl<'a, 'de> Visitor<'de> for MessageVisitor<'a> { } } -impl<'a, 'de> Visitor<'de> for MessageVisitorInner<'a> { +impl<'de> Visitor<'de> for MessageVisitorInner<'_> { type Value = (); fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -588,7 +588,7 @@ impl<'a, 'de> Visitor<'de> for MessageVisitorInner<'a> { } } -impl<'a, 'de> Visitor<'de> for EnumVisitor<'a> { +impl Visitor<'_> for EnumVisitor<'_> { type Value = i32; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { diff --git a/prost-reflect/src/dynamic/serde/de/mod.rs b/prost-reflect/src/dynamic/serde/de/mod.rs index 2324a69a..cd272278 100644 --- a/prost-reflect/src/dynamic/serde/de/mod.rs +++ b/prost-reflect/src/dynamic/serde/de/mod.rs @@ -87,7 +87,7 @@ where struct MessageSeed<'a>(&'a MessageDescriptor, &'a DeserializeOptions); -impl<'a, 'de> DeserializeSeed<'de> for MessageSeed<'a> { +impl<'de> DeserializeSeed<'de> for MessageSeed<'_> { type Value = DynamicMessage; fn deserialize(self, deserializer: D) -> Result @@ -100,7 +100,7 @@ impl<'a, 'de> DeserializeSeed<'de> for MessageSeed<'a> { struct FieldDescriptorSeed<'a, T>(&'a T, &'a DeserializeOptions); -impl<'a, 'de, T> DeserializeSeed<'de> for FieldDescriptorSeed<'a, T> +impl<'de, T> DeserializeSeed<'de> for FieldDescriptorSeed<'_, T> where T: FieldDescriptorLike, { @@ -126,7 +126,7 @@ where struct OptionalFieldDescriptorSeed<'a, T>(&'a T, &'a DeserializeOptions); -impl<'a, 'de, T> DeserializeSeed<'de> for OptionalFieldDescriptorSeed<'a, T> +impl<'de, T> DeserializeSeed<'de> for OptionalFieldDescriptorSeed<'_, T> where T: FieldDescriptorLike, { @@ -140,7 +140,7 @@ where } } -impl<'a, 'de, T> Visitor<'de> for OptionalFieldDescriptorSeed<'a, T> +impl<'de, T> Visitor<'de> for OptionalFieldDescriptorSeed<'_, T> where T: FieldDescriptorLike, { diff --git a/prost-reflect/src/dynamic/serde/de/wkt.rs b/prost-reflect/src/dynamic/serde/de/wkt.rs index e6426003..296ae2e0 100644 --- a/prost-reflect/src/dynamic/serde/de/wkt.rs +++ b/prost-reflect/src/dynamic/serde/de/wkt.rs @@ -34,7 +34,7 @@ pub struct GoogleProtobufStructVisitor; pub struct GoogleProtobufValueVisitor; pub struct GoogleProtobufEmptyVisitor; -impl<'a, 'de> Visitor<'de> for GoogleProtobufAnyVisitor<'a> { +impl<'de> Visitor<'de> for GoogleProtobufAnyVisitor<'_> { type Value = prost_types::Any; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -131,7 +131,7 @@ impl<'a, 'de> Visitor<'de> for GoogleProtobufAnyVisitor<'a> { } } -impl<'de> Visitor<'de> for GoogleProtobufNullVisitor { +impl Visitor<'_> for GoogleProtobufNullVisitor { type Value = i32; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -158,7 +158,7 @@ impl<'de> Visitor<'de> for GoogleProtobufNullVisitor { } } -impl<'de> Visitor<'de> for GoogleProtobufTimestampVisitor { +impl Visitor<'_> for GoogleProtobufTimestampVisitor { type Value = prost_types::Timestamp; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -179,7 +179,7 @@ impl<'de> Visitor<'de> for GoogleProtobufTimestampVisitor { } } -impl<'de> Visitor<'de> for GoogleProtobufDurationVisitor { +impl Visitor<'_> for GoogleProtobufDurationVisitor { type Value = prost_types::Duration; fn expecting(&self, f: &mut fmt::Formatter) -> fmt::Result { @@ -198,7 +198,7 @@ impl<'de> Visitor<'de> for GoogleProtobufDurationVisitor { } } -impl<'de> Visitor<'de> for GoogleProtobufFieldMaskVisitor { +impl Visitor<'_> for GoogleProtobufFieldMaskVisitor { type Value = prost_types::FieldMask; fn visit_str(self, v: &str) -> Result diff --git a/prost-reflect/src/dynamic/serde/ser/mod.rs b/prost-reflect/src/dynamic/serde/ser/mod.rs index fd3a73f9..c31380b2 100644 --- a/prost-reflect/src/dynamic/serde/ser/mod.rs +++ b/prost-reflect/src/dynamic/serde/ser/mod.rs @@ -30,7 +30,7 @@ where .serialize(serializer) } -impl<'a> Serialize for SerializeWrapper<'a, DynamicMessage> { +impl Serialize for SerializeWrapper<'_, DynamicMessage> { fn serialize(&self, serializer: S) -> Result where S: Serializer, @@ -237,7 +237,7 @@ impl<'a> Serialize for SerializeWrapper<'a, ValueAndKind<'a>> { } } -impl<'a> Serialize for SerializeWrapper<'a, MapKey> { +impl Serialize for SerializeWrapper<'_, MapKey> { fn serialize(&self, serializer: S) -> Result where S: Serializer, diff --git a/prost-reflect/src/dynamic/serde/ser/wkt.rs b/prost-reflect/src/dynamic/serde/ser/wkt.rs index c4b41972..f7487a78 100644 --- a/prost-reflect/src/dynamic/serde/ser/wkt.rs +++ b/prost-reflect/src/dynamic/serde/ser/wkt.rs @@ -330,7 +330,7 @@ where serialize_list_inner(&raw, serializer, options) } -impl<'a> Serialize for SerializeWrapper<'a, prost_types::Value> { +impl Serialize for SerializeWrapper<'_, prost_types::Value> { fn serialize(&self, serializer: S) -> Result where S: Serializer, diff --git a/prost-reflect/src/dynamic/text_format/parse/lex.rs b/prost-reflect/src/dynamic/text_format/parse/lex.rs index 4038b5d0..d175d8c5 100644 --- a/prost-reflect/src/dynamic/text_format/parse/lex.rs +++ b/prost-reflect/src/dynamic/text_format/parse/lex.rs @@ -62,7 +62,7 @@ pub(crate) struct TokenExtras { pub error: Option, } -impl<'a> fmt::Display for Token<'a> { +impl fmt::Display for Token<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { match self { Token::Ident(value) => write!(f, "{}", value),