diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..5cec72c --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,2 @@ +github: [fasterthanlime] +patreon: fasterthanlime diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 5468630..f5af643 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -16,7 +16,7 @@ jobs: container: image: ghcr.io/facet-rs/facet-ci:latest-amd64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: Swatinem/rust-cache@v2 @@ -47,7 +47,7 @@ jobs: container: image: ghcr.io/facet-rs/facet-ci:latest-amd64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: Swatinem/rust-cache@v2 @@ -68,7 +68,7 @@ jobs: container: image: ghcr.io/facet-rs/facet-ci:latest-amd64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: Swatinem/rust-cache@v2 @@ -92,7 +92,7 @@ jobs: container: image: ghcr.io/facet-rs/facet-ci:latest-amd64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: Swatinem/rust-cache@v2 @@ -111,7 +111,7 @@ jobs: container: image: ghcr.io/facet-rs/facet-ci:latest-amd64 steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: Swatinem/rust-cache@v2 @@ -128,7 +128,7 @@ jobs: permissions: security-events: write # to upload sarif results steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v5 - uses: Swatinem/rust-cache@v2 diff --git a/Cargo.lock b/Cargo.lock index b0406ca..e49bad7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -10,9 +10,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" [[package]] name = "bitflags" -version = "2.9.1" +version = "2.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967" +checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394" [[package]] name = "btparse" @@ -34,9 +34,9 @@ checksum = "7b02b629252fe8ef6460461409564e2c21d0c8e77e0944f3d189ff06c4e932ad" [[package]] name = "color-backtrace" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2123a5984bd52ca861c66f66a9ab9883b27115c607f801f86c1bc2a84eb69f0f" +checksum = "e49b1973af2a47b5b44f7dd0a344598da95c872e1556b045607888784e973b91" dependencies = [ "btparse", "termcolor", @@ -51,7 +51,7 @@ dependencies = [ "encode_unicode", "libc", "once_cell", - "windows-sys", + "windows-sys 0.59.0", ] [[package]] @@ -72,9 +72,9 @@ dependencies = [ [[package]] name = "facet" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3290e0be77e9eeca366489c3b4010764dc897a83e5936a93857c3937f47a57aa" +checksum = "867e3a6ecc0a6b847b2617953c7639dfa0e18e5644887df8d9533e1fff32b4d3" dependencies = [ "facet-core", "facet-macros", @@ -83,9 +83,9 @@ dependencies = [ [[package]] name = "facet-core" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8643770dc61323e6ae5620f336f4c4fc283a6bf39e6701fed32efa747fba5a6a" +checksum = "52e5c150b48fd89a6a880ca0a5e7cf09d1c7c51ff57af655a740166a8a3fabbb" dependencies = [ "bitflags", "impls", @@ -93,9 +93,9 @@ dependencies = [ [[package]] name = "facet-macros" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb526288148251e984f3a9ab3cef5191ca1da34a45fb5c548781e7053148e19" +checksum = "1c99805fe2af7628a512245cf4cf4971ba48ff2a9e16c8bd96fdb3b5ab6e8753" dependencies = [ "facet-core", "facet-macros-emit", @@ -103,9 +103,9 @@ dependencies = [ [[package]] name = "facet-macros-emit" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52619b4834e81068fd915795c297e52f894a18742581627568d451e39dd1c906" +checksum = "feee279473e7cd2ac1dee5bdd4c3fe9b4acb74f175a2feb78f5b2dff63b5a404" dependencies = [ "facet-macros-parse", "quote", @@ -113,9 +113,9 @@ dependencies = [ [[package]] name = "facet-macros-parse" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6097c15775794dd66eb69cd4614be654877e3e6e4a93ca0d0440236c1798f0b" +checksum = "c9bed6c12da3f0215a9037d2dedc6e407d689f333c984e23af5dbc29aa697ca9" dependencies = [ "proc-macro2", "quote", @@ -124,7 +124,7 @@ dependencies = [ [[package]] name = "facet-msgpack" -version = "0.28.0" +version = "0.29.0" dependencies = [ "cargo-husky", "eyre", @@ -141,20 +141,19 @@ dependencies = [ [[package]] name = "facet-reflect" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1d24ca6fb9db79b26cb5e37d744591d710e05922dbca7c53505113151b50aef" +checksum = "759240e5415b59d2712aec606b374f5d10ad071b2ff17daeb53ec7e987b60ac3" dependencies = [ "bitflags", "facet-core", - "owo-colors", ] [[package]] name = "facet-serialize" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cca2724e50a1f41f9f0d3a035b9dd8ef4d174f2c3bfd7caaab4baeb6d69feed9" +checksum = "8120d560b46dca40232f62fac58c9d986449dbf8b7f41f7aee71322fc09f93a1" dependencies = [ "facet-core", "facet-reflect", @@ -163,9 +162,9 @@ dependencies = [ [[package]] name = "facet-testhelpers" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d754d1d685cb364da2c7ffead1c10f4fdb1573653efed0ae1fe8edea20da6c37" +checksum = "a2ddb3c5cdc153b388146f32f94e533832b23a71eaccce1eb4fca5af557b9832" dependencies = [ "color-backtrace", "facet-testhelpers-macros", @@ -175,9 +174,9 @@ dependencies = [ [[package]] name = "facet-testhelpers-macros" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2202a62fd9bcb98cdef3896393b8886d3341e56bcc69cb4142c436298861b901" +checksum = "5f9a8e7044c1b922568e4061d6f3ee1bd391d053f11c371db348a0a6b649cbed" dependencies = [ "quote", "unsynn", @@ -200,15 +199,15 @@ checksum = "7a46645bbd70538861a90d0f26c31537cdf1e44aae99a794fb75a664b70951bc" [[package]] name = "indenter" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683" +checksum = "964de6e86d545b246d84badc0fef527924ace5134f30641c203ef52ba83f58d5" [[package]] name = "insta" -version = "1.43.1" +version = "1.43.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "154934ea70c58054b556dd430b99a98c2a7ff5309ac9891597e339b5c28f4371" +checksum = "46fdb647ebde000f43b5b53f773c30cf9b0cb4300453208713fa38b2c70935a0" dependencies = [ "console", "once_cell", @@ -217,15 +216,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.174" +version = "0.2.175" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776" +checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543" [[package]] name = "log" -version = "0.4.27" +version = "0.4.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" +checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432" [[package]] name = "mutants" @@ -262,9 +261,9 @@ checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "proc-macro2" -version = "1.0.95" +version = "1.0.101" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" +checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de" dependencies = [ "unicode-ident", ] @@ -302,18 +301,28 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.219" +version = "1.0.220" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" +checksum = "ceecad4c782e936ac90ecfd6b56532322e3262b14320abf30ce89a92ffdbfe22" +dependencies = [ + "serde_core", + "serde_derive", +] + +[[package]] +name = "serde_core" +version = "1.0.220" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddba47394f3b862d6ff6efdbd26ca4673e3566a307880a0ffb98f274bbe0ec32" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.219" +version = "1.0.220" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" +checksum = "60e1f3b1761e96def5ec6d04a6e7421c0404fa3cf5c0155f1e2848fae3d8cc08" dependencies = [ "proc-macro2", "quote", @@ -340,9 +349,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "syn" -version = "2.0.104" +version = "2.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40" +checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6" dependencies = [ "proc-macro2", "quote", @@ -360,9 +369,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.18" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" +checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d" [[package]] name = "unsynn" @@ -378,13 +387,19 @@ dependencies = [ [[package]] name = "winapi-util" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" +checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys", + "windows-sys 0.61.0", ] +[[package]] +name = "windows-link" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65" + [[package]] name = "windows-sys" version = "0.59.0" @@ -394,6 +409,15 @@ dependencies = [ "windows-targets", ] +[[package]] +name = "windows-sys" +version = "0.61.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e201184e40b2ede64bc2ea34968b28e33622acdbbf37104f0e4a33f7abe657aa" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-targets" version = "0.52.6" diff --git a/Cargo.toml b/Cargo.toml index f8bba4d..5b73dd2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "facet-msgpack" -version = "0.28.0" +version = "0.29.0" edition = "2024" rust-version = "1.87" license = "MIT OR Apache-2.0" @@ -16,14 +16,14 @@ keywords = [ categories = ["encoding", "parsing", "data-structures"] [dependencies] -facet-core = { version = "0.28.0" } -facet-reflect = { version = "0.28.0" } +facet-core = { version = "0.29.0" } +facet-reflect = { version = "0.29.0" } log = "0.4.27" -facet-serialize = { version = "0.28.0" } +facet-serialize = { version = "0.29.0" } [dev-dependencies] -facet = { version = "0.28.0" } -facet-testhelpers = { version = "0.28.0" } +facet = { version = "0.29.0" } +facet-testhelpers = { version = "0.29.0" } eyre = "0.6.12" insta = "1.43.1" rmp-serde = "1.3" diff --git a/README.md b/README.md index 1875cce..9866c1a 100644 --- a/README.md +++ b/README.md @@ -1,49 +1,11 @@ -

- - - - - Facet logo - a reflection library for Rust - -

+# facet-msgpack -[![Coverage Status](https://coveralls.io/repos/github/facet-rs/facet/badge.svg?branch=main)](https://coveralls.io/github/facet-rs/facet?branch=main) +[![Coverage Status](https://coveralls.io/repos/github/facet-rs/facet-msgpack/badge.svg?branch=main)](https://coveralls.io/github/facet-rs/facet?branch=main) [![crates.io](https://img.shields.io/crates/v/facet-msgpack.svg)](https://crates.io/crates/facet-msgpack) [![documentation](https://docs.rs/facet-msgpack/badge.svg)](https://docs.rs/facet-msgpack) [![MIT/Apache-2.0 licensed](https://img.shields.io/crates/l/facet-msgpack.svg)](./LICENSE) [![Discord](https://img.shields.io/discord/1379550208551026748?logo=discord&label=discord)](https://discord.gg/JhD7CwCJ8F) -_Logo by [Misiasart](https://misiasart.com/)_ - -Thanks to all individual and corporate sponsors, without whom this work could not exist: - -

- - -Ko-fi - - - - -GitHub Sponsors - - - - -Patreon - - - - -Zed - - - - -Depot - -

- Provides MessagePack serialization and deserialization for [facet](https://crates.io/crates/facet) types. ## Usage @@ -72,6 +34,47 @@ println!("Serialized MessagePack: {:?}", bytes); // Deserialization would use from_bytes (not shown here) ``` +## Sponsors + +Thanks to all individual sponsors: + +

+ + +GitHub Sponsors + + + + + Patreon + +

+ +...along with corporate sponsors: + +

+ + +AWS + + + + +Zed + + + + +Depot + +

+ +...without whom this work could not exist. + +## Special thanks + +The facet logo was drawn by [Misiasart](https://misiasart.com/). + ## License Licensed under either of: diff --git a/src/deserialize.rs b/src/deserialize.rs index 749d19b..d800f53 100644 --- a/src/deserialize.rs +++ b/src/deserialize.rs @@ -457,11 +457,7 @@ impl<'input> Decoder<'input> { wip.begin_nth_field(i)?; // Check for field-level default function first, then type-level default - if let Some(field_default_fn) = field.vtable.default_fn { - wip.set_field_default(field_default_fn)?; - } else { - wip.set_default()?; - } + wip.set_default()?; wip.end()?; } else { @@ -541,7 +537,7 @@ impl<'input> Decoder<'input> { wip.select_nth_variant(idx)?; for field_idx in 0..field_count { - wip.begin_nth_enum_field(field_idx)?; + wip.begin_nth_field(field_idx)?; self.deserialize_value(wip)?; wip.end()?; } @@ -558,7 +554,7 @@ impl<'input> Decoder<'input> { let field_name = self.decode_string()?; match wip.field_index(&field_name) { Some(field_idx) => { - wip.begin_nth_enum_field(field_idx)?; + wip.begin_nth_field(field_idx)?; self.deserialize_value(wip)?; wip.end()?; } diff --git a/src/serialize.rs b/src/serialize.rs index 0ff7275..bc439d0 100644 --- a/src/serialize.rs +++ b/src/serialize.rs @@ -5,7 +5,7 @@ use log::trace; use std::io::{self, Write}; /// Serializes any Facet type to MessagePack bytes -pub fn to_vec<'a, T: Facet<'a>>(value: &'a T) -> Vec { +pub fn to_vec<'a, T: Facet<'a>>(value: &T) -> Vec { let mut buffer = Vec::new(); let peek = Peek::new(value); let mut serializer = MessagePackSerializer {