diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 921c7df4..13073d27 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -31,53 +31,53 @@ jobs: repo-token: ${{ secrets.GITHUB_TOKEN }} - run: cargo test --all-features - # lints: - # name: Lints - # runs-on: ubuntu-latest - # steps: - # - uses: actions/checkout@v2 - # - uses: dtolnay/rust-toolchain@v1 - # with: - # toolchain: stable - # components: clippy, rustfmt - # - name: Get latest CMake and ninja - # uses: lukka/get-cmake@latest - # - name: Install Protoc - # uses: arduino/setup-protoc@v1 - # with: - # repo-token: ${{ secrets.GITHUB_TOKEN }} - # - run: cargo fmt --all -- --check - # - run: cargo clippy --all -- -D warnings - # - run: cargo check - # - run: cargo check --package prost-reflect --no-default-features - # - run: cargo check --package prost-reflect --no-default-features --features=text-format - # - run: cargo check --package prost-reflect --no-default-features --features=serde - # - run: cargo check --package prost-reflect --all-features - # - name: Check README.md is up-to-date - # shell: pwsh - # run: | - # ./generate-readme.ps1 - # if (git diff README.md) { - # Write-Error "README.md is out-of-date, run generate-readme.ps1 to regenerate it." -ErrorAction Stop - # } + lints: + name: Lints + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: dtolnay/rust-toolchain@v1 + with: + toolchain: stable + components: clippy, rustfmt + - name: Get latest CMake and ninja + uses: lukka/get-cmake@latest + - name: Install Protoc + uses: arduino/setup-protoc@v1 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + - run: cargo fmt --all -- --check + - run: cargo clippy --all -- -D warnings + - run: cargo check + - run: cargo check --package prost-reflect --no-default-features + - run: cargo check --package prost-reflect --no-default-features --features=text-format + - run: cargo check --package prost-reflect --no-default-features --features=serde + - run: cargo check --package prost-reflect --all-features + - name: Check README.md is up-to-date + shell: pwsh + run: | + ./generate-readme.ps1 + if (git diff README.md) { + Write-Error "README.md is out-of-date, run generate-readme.ps1 to regenerate it." -ErrorAction Stop + } - # coverage: - # name: Coverage - # runs-on: ubuntu-latest - # container: - # image: xd009642/tarpaulin:develop - # options: --security-opt seccomp=unconfined - # steps: - # - uses: actions/checkout@v2 - # - name: Install Protoc - # uses: arduino/setup-protoc@v1 - # with: - # repo-token: ${{ secrets.GITHUB_TOKEN }} - # - name: Generate code coverage - # run: | - # cargo tarpaulin --verbose --packages prost-reflect prost-reflect-tests --all-features --timeout 120 --out xml - # - name: Upload to codecov.io - # uses: codecov/codecov-action@v4 - # with: - # fail_ci_if_error: true - # token: ${{ secrets.CODECOV_TOKEN }} + coverage: + name: Coverage + runs-on: ubuntu-latest + container: + image: xd009642/tarpaulin:develop + options: --security-opt seccomp=unconfined + steps: + - uses: actions/checkout@v2 + - name: Install Protoc + uses: arduino/setup-protoc@v1 + with: + repo-token: ${{ secrets.GITHUB_TOKEN }} + - name: Generate code coverage + run: | + cargo tarpaulin --verbose --packages prost-reflect prost-reflect-tests --all-features --timeout 120 --out xml + - name: Upload to codecov.io + uses: codecov/codecov-action@v4 + with: + fail_ci_if_error: true + token: ${{ secrets.CODECOV_TOKEN }} diff --git a/Cargo.lock b/Cargo.lock index fadbea98..7e022be4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -481,15 +481,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.13.0" @@ -571,7 +562,7 @@ dependencies = [ "proc-macro2", "quote", "regex-syntax", - "syn 2.0.69", + "syn 2.0.70", ] [[package]] @@ -609,7 +600,7 @@ checksum = "dcf09caffaac8068c346b6df2a7fc27a177fd20b39421a39ce0a211bde679a6c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.70", ] [[package]] @@ -721,7 +712,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e" dependencies = [ "proc-macro2", - "syn 2.0.69", + "syn 2.0.70", ] [[package]] @@ -764,16 +755,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "prost" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" -dependencies = [ - "bytes", - "prost-derive 0.12.6", -] - [[package]] name = "prost" version = "0.13.0" @@ -781,7 +762,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac47baaef3631368888abc13a62cb6d42b88bfd5c3fc6f920a9cbe4d7d3ddc9d" dependencies = [ "bytes", - "prost-derive 0.13.0", + "prost-derive", ] [[package]] @@ -798,26 +779,13 @@ dependencies = [ "once_cell", "petgraph", "prettyplease", - "prost 0.13.0", - "prost-types 0.13.0", + "prost", + "prost-types", "regex", - "syn 2.0.69", + "syn 2.0.70", "tempfile", ] -[[package]] -name = "prost-derive" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" -dependencies = [ - "anyhow", - "itertools 0.12.1", - "proc-macro2", - "quote", - "syn 2.0.69", -] - [[package]] name = "prost-derive" version = "0.13.0" @@ -828,20 +796,7 @@ dependencies = [ "itertools 0.13.0", "proc-macro2", "quote", - "syn 2.0.69", -] - -[[package]] -name = "prost-reflect" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f5eec97d5d34bdd17ad2db2219aabf46b054c6c41bd5529767c9ce55be5898f" -dependencies = [ - "logos", - "miette", - "once_cell", - "prost 0.12.6", - "prost-types 0.12.6", + "syn 2.0.70", ] [[package]] @@ -854,11 +809,11 @@ dependencies = [ "miette", "once_cell", "proptest", - "prost 0.13.0", + "prost", "prost-build", "prost-reflect-build", "prost-reflect-derive", - "prost-types 0.13.0", + "prost-types", "protox", "serde", "serde-value", @@ -872,7 +827,7 @@ name = "prost-reflect-build" version = "0.14.0" dependencies = [ "prost-build", - "prost-reflect 0.14.0", + "prost-reflect", ] [[package]] @@ -883,10 +838,10 @@ dependencies = [ "env_logger", "flate2", "once_cell", - "prost 0.13.0", + "prost", "prost-build", - "prost-reflect 0.14.0", - "prost-types 0.13.0", + "prost-reflect", + "prost-types", "serde", "serde_json", "tar", @@ -900,10 +855,10 @@ version = "0.14.0" dependencies = [ "once_cell", "proc-macro2", - "prost 0.13.0", - "prost-reflect 0.14.0", + "prost", + "prost-reflect", "quote", - "syn 2.0.69", + "syn 2.0.70", "trybuild", ] @@ -915,58 +870,49 @@ dependencies = [ "once_cell", "proptest", "proptest-derive", - "prost 0.13.0", + "prost", "prost-build", - "prost-reflect 0.14.0", + "prost-reflect", "prost-reflect-build", - "prost-types 0.13.0", + "prost-types", "rayon", "serde", "serde_json", ] -[[package]] -name = "prost-types" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" -dependencies = [ - "prost 0.12.6", -] - [[package]] name = "prost-types" version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36c1964ef64b94480df8c92ae14e5764d470014ad951d2f99e5a6c0c7712710c" dependencies = [ - "prost 0.13.0", + "prost", ] [[package]] name = "protox" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac532509cee918d40f38c3e12f8ef9230f215f017d54de7dd975015538a42ce7" +checksum = "70cdc4ca5487c1fddc30fa2bebba28c0f250f80c944190652ccaaeb157349175" dependencies = [ "bytes", "miette", - "prost 0.12.6", - "prost-reflect 0.13.1", - "prost-types 0.12.6", + "prost", + "prost-reflect", + "prost-types", "protox-parse", "thiserror", ] [[package]] name = "protox-parse" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6c33f43516fe397e2f930779d720ca12cd057f7da4cd6326a0ef78d69dee96" +checksum = "a3a462d115462c080ae000c29a47f0b3985737e5d3a995fcdbcaa5c782068dde" dependencies = [ "logos", "miette", - "prost-types 0.12.6", + "prost-types", "thiserror", ] @@ -1202,7 +1148,7 @@ checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.70", ] [[package]] @@ -1284,9 +1230,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.69" +version = "2.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "201fcda3845c23e8212cd466bfebf0bd20694490fc0356ae8e428e0824a915a6" +checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" dependencies = [ "proc-macro2", "quote", @@ -1348,7 +1294,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.70", ] [[package]] @@ -1548,7 +1494,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.70", "wasm-bindgen-shared", ] @@ -1570,7 +1516,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.69", + "syn 2.0.70", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/Cargo.toml b/Cargo.toml index 042d4153..33069def 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,6 +12,5 @@ members = [ allow-branch = ["main"] consolidate-commits = false -# [patch.crates-io] -# prost-reflect = { path = "prost-reflect" } -# prost = "0.12.0" +[patch.crates-io] +prost-reflect = { path = "prost-reflect" } diff --git a/prost-reflect/Cargo.toml b/prost-reflect/Cargo.toml index 2741abb3..868f15dd 100644 --- a/prost-reflect/Cargo.toml +++ b/prost-reflect/Cargo.toml @@ -46,7 +46,7 @@ once_cell = "1.13.0" proptest = "1.0.0" prost-build = "0.13.0" prost-reflect-build = { path = "../prost-reflect-build" } -protox = "0.6.0" +protox = "0.7.0" serde_json = "1.0.106" serde_yaml = "0.9.25" similar-asserts = { version = "1.4.2", features = ["serde"] }