Upgrade zerocopy-derive to syn 3 and re-vendor dependencies

.github/workflows/ci.yml

@@ -108,6 +108,12 @@ jobs:
             features: "--all-features"
           - toolchain: "stable"
             features: "--all-features"
+          # The derive feature inherits the MSRV of its dependencies. Syn 3
+          # requires Rust 1.71 and uses post-1.56 language and library
+          # features, so don't test feature sets that enable zerocopy-derive
+          # on the core library MSRV.
+          - toolchain: "msrv"
+            features: "--features __internal_use_only_features_that_work_on_stable"
           - toolchain: "no-zerocopy-simd-x86-avx12-1-89-0"
             features: "--all-features"
           - toolchain: "no-zerocopy-core-error-1-81-0"
@@ -132,8 +138,12 @@ jobs:
             features: "--features __internal_use_only_features_that_work_on_stable"
           - crate: "zerocopy-derive"
             features: "--all-features"
-          # Exclue any combination of zerocopy-derive and any toolchain version
-          # other than "msrv", "stable", and "nightly". These other versions
+          # Exclude zerocopy-derive on the core library MSRV; derive
+          # inherits the MSRV of its dependencies.
+          - crate: "zerocopy-derive"
+            toolchain: "msrv"
+          # Exclude any combination of zerocopy-derive and any toolchain version
+          # other than "stable" and "nightly". These other versions
           # exist to exercise zerocopy behavior which differs by toolchain;
           # zerocopy-derive doesn't behave differently on these toolchains.
           - crate: "zerocopy-derive"

zerocopy/vendor/prettyplease/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"Cargo.toml":"6db1cca4fbfeefb2fcbac8874c25981ddc265bcccfe698fb27984508f368c858","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"dde54d4d5c759fbaea82b4039ab9cea7ee91918431dae011ffe01472e2e9eb44","build.rs":"fdf8aa9b5441b298c72ae23645e227adc52ac69d2decc1bda04e1a91f70ff87d","examples/input.rs":"53350088f12a346a99034af41ef432dedcc9e5d581c5592d9aae3807c42656c1","examples/output.prettyplease.rs":"fa63c118daadb64c456ec5b8d5e46e5d7fabbbeb6a6e61a08eabc23360a18fbd","examples/output.rustc.rs":"0c66f8929fa40a2822d4ea1aec3d8b83db598aba043b17f3c1a6133f0d657135","examples/output.rustfmt.rs":"914a9aea1c51e097bfd80c9af4011811e6126c9df5fb0eac3d40b1203fba7c58","src/algorithm.rs":"7a4a7b62f5300aabf7fcff3cd8c8aaa3ae1e3d1dc717eea1e4797988ce0e18c7","src/attr.rs":"54e829ae468f22c8e2853d669515575f1444bfee026cfd9b19538f77caf10ab7","src/convenience.rs":"dd392b009b691d3587c7d8e3caeaacf450303c4223792b5f89c336358e371c39","src/data.rs":"9db6623d3ccc79b541a28bdc88875ad0036576689e085007eb362819f8e9a2d3","src/expr.rs":"fd39086a275071f50cb4b519a6b5413a27863dc2a142888e9a1acc1c841b1a1a","src/file.rs":"5689efa3c5959a6a0d8cfc2c13bf8a37ab0669e2b81dbded3f3c28884a88fca0","src/generics.rs":"60df8d54fe81279bcdf790e027eb5e6f80798ffd0873fa0f5bdff921582df397","src/item.rs":"711f2c9a00e9577c058d38cf3e521390f77cb7d0a36955353a4fac2b64af2a4b","src/iter.rs":"38b2cd3b38719c6024fb6b3aa739f6f8736c83193fd21e2365d4f6c27bc41666","src/lib.rs":"09d5eb7ba944ab09e9094fbe9ce1f1a9b9942b8098fa6b84a20f3d079921b6f4","src/lifetime.rs":"6d420430168185b2da3409bc38a45f63cced9443915f04e6aec71367fc070dcf","src/lit.rs":"6aabc9c84f8914064536f7ed89547485c08f042f3f386e88fb1c8f82ec69d8e7","src/mac.rs":"62911747c308187afc750b4bd4f8bd24ee825081043d78da68a001ea55ab5853","src/pat.rs":"d130b141a3fd8098913cb179efe6600a5f010a2719447ecb3d4fb29e9b546220","src/path.rs":"b9c78a53c433678140b5a0e4044872989f25db2fe4fd44123e2500efbde671eb","src/ring.rs":"e23d133209b977e457b07b0cd93b3711d01f4172d7cfa4cf6a7247637390e606","src/stmt.rs":"c9328d8e5111087ed0f8226b9765ddc636e17cb9e4f86301794bb9d3a27cb39a","src/token.rs":"c288b1d81f2a35673d4ca1dd10d3386670b067460121df3038303e1ed73b41a7","src/ty.rs":"b5fa5f318c5e4593ed3eed4707e63dceaa62eea4ecdfba0f59bd946917ca3dbd","tests/test.rs":"04994ad0a37c43457390f11ade6ab74fc26c5e879b0a374f0b64acb530a0a496"},"package":"8d3928fb5db768cb86f891ff014f0144589297e3c6a1aba6ed7cecfdace270c7"}
+{"files":{".cargo_vcs_info.json":"9ec693c56142ba5d73f4156a7a266ca1cbb7d145fe7df64e3d88106b8f3563f9",".github/FUNDING.yml":"b017158736b3c9751a2d21edfce7fe61c8954e2fced8da8dd3013c2f3e295bd9",".github/workflows/ci.yml":"a93f16c298434c64c2691e673a9229809ef238d39b509cae3501de46ac0afbb4","Cargo.lock":"eb29633a4b99efc641a9c13540cdbaceefd9a2a2cf72992ec6257d2ebdd6b48c","Cargo.toml":"6474a08956c9922f41924680a4ba418ad99117c61bcfbad94e5b4b4d258a663b","Cargo.toml.orig":"bd9562b75d7ecdd85bec47fa5d936be80a96cf7fc386b41c9f47bdab21b819ed","LICENSE-APACHE":"62c7a1e35f56406896d7aa7ca52d0cc0d272ac022b5d2796e7d6905db8a3636a","LICENSE-MIT":"23f18e03dc49df91622fe2a76176497404e46ced8a715d9d2b67a7446571cca3","README.md":"f586de4251ca5a441ec4c01b2c042a9cd8d4117a59c925f788ec5fcbf079fd1b","build.rs":"6e18666b8a69aa6b3d6fc6c7273e2d313f55075035ef5aff73b000e52eaedbfd","examples/.tokeignore":"23ab7a9f335a33747ebbc74f39c81b145cb7928e7fefe8055ca4db0a4fac7557","examples/input.rs":"53350088f12a346a99034af41ef432dedcc9e5d581c5592d9aae3807c42656c1","examples/output.prettyplease.rs":"fa63c118daadb64c456ec5b8d5e46e5d7fabbbeb6a6e61a08eabc23360a18fbd","examples/output.rustc.rs":"04647e9b01f2aa85982f849c2d897acf3b6931121c1ef953de5fb6a67b80e05a","examples/output.rustfmt.rs":"914a9aea1c51e097bfd80c9af4011811e6126c9df5fb0eac3d40b1203fba7c58","src/algorithm.rs":"901c91416d7526038bfad30e0066295a03d2bb995830016ace49a41540079010","src/attr.rs":"0a5c64b1c1f6fe4944c1d805c528ee4a9a8c6223e875afe9f48371cba66732ee","src/classify.rs":"709f6437a804fb1f135b0f454a1acea1f98e3519d1c785b62343ed24c5f2be84","src/convenience.rs":"dd392b009b691d3587c7d8e3caeaacf450303c4223792b5f89c336358e371c39","src/data.rs":"58299942fa3a90af9162dc7d256899d9c9389de3dcb8eb3927e706c20c2d2f81","src/expr.rs":"72136dc4537467957d620a135bdca7382c8fe4d32d5874b86fe7b7e7e7502e11","src/file.rs":"5689efa3c5959a6a0d8cfc2c13bf8a37ab0669e2b81dbded3f3c28884a88fca0","src/fixup.rs":"ecf87543c342fffc79bae54e4fa174cbfd5c341817315caa3b95cce0d49ebf7c","src/generics.rs":"613c5eaefe7a80d05967e96072431e080e0cffee01291f04b42dda8ecc9df149","src/item.rs":"235193c2ea4825091a1f5ed21715047d65656647219be9300be7652610bf23e0","src/iter.rs":"38b2cd3b38719c6024fb6b3aa739f6f8736c83193fd21e2365d4f6c27bc41666","src/lib.rs":"b25d72417ceacdfb4820461cc295b14800e12dc79f8e8c0ddafcab1957a4b68f","src/lifetime.rs":"6d420430168185b2da3409bc38a45f63cced9443915f04e6aec71367fc070dcf","src/lit.rs":"9ea6d25533e64df4ff01c084fa1c31ddf64fb3b159409eec7d80dbf281e5171e","src/mac.rs":"b4512317afe2221ca4c5cbc9f1e4e33aa399577b10c34c19071d07fd3b617a41","src/pat.rs":"ddc1352516d5f9c52d56b0939aef61a125121ef921874d80fcc8f571cf23b1d3","src/path.rs":"bb2c7946a3c742ab84f19c6229097832b35a9f6a94d550a6a80648e0321ceae7","src/precedence.rs":"a8ce97ba0a25f442b5f238c64f078d70f4114b4b0f9df82764d533dd39a47abb","src/ring.rs":"517b1a02f8e0a9c1316830117daad1e30d17e1fcf6428c6b438c626aa43286ae","src/stmt.rs":"e17ab9647fed9daa4f5b2fbd007015128f2a7fc65686a988593444a37242f885","src/token.rs":"c288b1d81f2a35673d4ca1dd10d3386670b067460121df3038303e1ed73b41a7","src/ty.rs":"b40ce3d2bf6caffa7605ca5f1961ebdc645a12e1aa43fbf3bda60ceab28f0180","tests/test.rs":"c6f8c7830b7491fca1d56e41aa4acc6256b683a3556a48982f57ae62d38aaaa2","tests/test_precedence.rs":"139ccee1718eb4b2690ee090104afbbc41a7eb44fb18b6f5cb900527d5955786"},"package":"2bfe0f4c752e450fc2faf62654f1c134747922825d5b04ca717b8874f41a40c0"}

zerocopy/vendor/prettyplease/.cargo_vcs_info.json

@@ -0,0 +1,6 @@
+{
+  "git": {
+    "sha1": "49e50897b580a5b7591ead6ef73f3fe09e76d896"
+  },
+  "path_in_vcs": ""
+}

zerocopy/vendor/prettyplease/.github/FUNDING.yml

@@ -0,0 +1 @@
+github: dtolnay

zerocopy/vendor/prettyplease/.github/workflows/ci.yml

@@ -0,0 +1,123 @@
+name: CI
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+  schedule: [cron: "40 1 * * *"]
+
+permissions:
+  contents: read
+
+env:
+  RUSTFLAGS: -Dwarnings
+
+jobs:
+  pre_ci:
+    uses: dtolnay/.github/.github/workflows/pre_ci.yml@master
+
+  test:
+    name: Rust ${{matrix.rust}}
+    needs: pre_ci
+    if: needs.pre_ci.outputs.continue
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        rust: [nightly, beta, stable, 1.71.0]
+    timeout-minutes: 45
+    steps:
+      - uses: actions/checkout@v7
+      - uses: dtolnay/rust-toolchain@master
+        with:
+          toolchain: ${{matrix.rust}}
+      - run: cargo check
+      - run: cargo check --features verbatim
+      - run: cargo test
+        env:
+          RUSTFLAGS: ${{env.RUSTFLAGS}} ${{matrix.rust == 'nightly' && '--cfg exhaustive' || ''}}
+      - run: cargo test --release --test test_precedence
+        env:
+          RUSTFLAGS: ${{env.RUSTFLAGS}} ${{matrix.rust == 'nightly' && '--cfg exhaustive' || ''}}
+        if: matrix.rust != '1.71.0'
+      - uses: actions/upload-artifact@v7
+        if: matrix.rust == 'nightly' && always()
+        with:
+          name: Cargo.lock
+          path: Cargo.lock
+        continue-on-error: true
+
+  examples:
+    name: Examples
+    needs: pre_ci
+    if: needs.pre_ci.outputs.continue
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    steps:
+      - uses: actions/checkout@v7
+      - uses: dtolnay/rust-toolchain@nightly
+        with:
+          components: llvm-tools, rustc-dev, rustfmt
+      - run: cargo run --manifest-path examples/update/Cargo.toml
+      - run: git diff --exit-code
+      - run: cargo run --manifest-path cargo-expand/update/Cargo.toml
+      - run: git diff --exit-code
+
+  fuzz:
+    name: Fuzz
+    needs: pre_ci
+    if: needs.pre_ci.outputs.continue
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    steps:
+      - uses: actions/checkout@v7
+      - uses: dtolnay/rust-toolchain@nightly
+      - uses: dtolnay/install@cargo-fuzz
+      - run: cargo fuzz check
+
+  minimal:
+    name: Minimal versions
+    needs: pre_ci
+    if: needs.pre_ci.outputs.continue
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    steps:
+      - uses: actions/checkout@v7
+      - uses: dtolnay/rust-toolchain@nightly
+      - run: cargo generate-lockfile -Z minimal-versions
+      - run: cargo check --locked
+
+  doc:
+    name: Documentation
+    needs: pre_ci
+    if: needs.pre_ci.outputs.continue
+    runs-on: ubuntu-latest
+    timeout-minutes: 45
+    env:
+      RUSTDOCFLAGS: -Dwarnings
+    steps:
+      - uses: actions/checkout@v7
+      - uses: dtolnay/rust-toolchain@nightly
+      - uses: dtolnay/install@cargo-docs-rs
+      - run: cargo docs-rs
+
+  clippy:
+    name: Clippy
+    runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request'
+    timeout-minutes: 45
+    steps:
+      - uses: actions/checkout@v7
+      - uses: dtolnay/rust-toolchain@clippy
+      - run: cargo clippy --features verbatim -- -Dclippy::all -Dclippy::pedantic
+
+  outdated:
+    name: Outdated
+    runs-on: ubuntu-latest
+    if: github.event_name != 'pull_request'
+    timeout-minutes: 45
+    steps:
+      - uses: actions/checkout@v7
+      - uses: dtolnay/rust-toolchain@stable
+      - uses: dtolnay/install@cargo-outdated
+      - run: cargo outdated --workspace --exit-code 1

zerocopy/vendor/prettyplease/Cargo.toml

@@ -11,13 +11,18 @@
 
 [package]
 edition = "2021"
-rust-version = "1.56"
+rust-version = "1.71"
 name = "prettyplease"
-version = "0.2.17"
+version = "0.3.0"
 authors = ["David Tolnay <dtolnay@gmail.com>"]
-links = "prettyplease02"
+build = "build.rs"
+links = "prettyplease03"
 exclude = ["cargo-expand"]
+autolib = false
+autobins = false
 autoexamples = false
+autotests = false
+autobenches = false
 description = "A minimal `syn` syntax tree pretty-printer"
 documentation = "https://docs.rs/prettyplease"
 readme = "README.md"
@@ -27,39 +32,60 @@ license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/prettyplease"
 
 [package.metadata.docs.rs]
-rustdoc-args = ["--generate-link-to-definition"]
 targets = ["x86_64-unknown-linux-gnu"]
+rustdoc-args = [
+    "--generate-link-to-definition",
+    "--generate-macro-expansion",
+    "--extern-html-root-url=core=https://doc.rust-lang.org",
+    "--extern-html-root-url=alloc=https://doc.rust-lang.org",
+    "--extern-html-root-url=std=https://doc.rust-lang.org",
+]
 
 [package.metadata.playground]
 features = ["verbatim"]
 
+[features]
+verbatim = ["syn/parsing"]
+
 [lib]
-doc-scrape-examples = false
+name = "prettyplease"
+path = "src/lib.rs"
+
+[[test]]
+name = "test"
+path = "tests/test.rs"
+
+[[test]]
+name = "test_precedence"
+path = "tests/test_precedence.rs"
 
 [dependencies.proc-macro2]
-version = "1.0.74"
+version = "1.0.80"
 default-features = false
 
 [dependencies.syn]
-version = "2.0.46"
+version = "3"
 features = ["full"]
 default-features = false
 
 [dev-dependencies.indoc]
 version = "2"
 
 [dev-dependencies.proc-macro2]
-version = "1.0.74"
+version = "1.0.80"
 default-features = false
 
 [dev-dependencies.quote]
 version = "1.0.35"
 default-features = false
 
 [dev-dependencies.syn]
-version = "2.0.46"
-features = ["parsing"]
+version = "3"
+features = [
+    "clone-impls",
+    "extra-traits",
+    "parsing",
+    "printing",
+    "visit-mut",
+]
 default-features = false
-
-[features]
-verbatim = ["syn/parsing"]