From 4ba0d583cb41acf64fa2e433fb4030f19be3f9b1 Mon Sep 17 00:00:00 2001 From: Seth Westphal Date: Thu, 4 Jan 2024 19:32:52 -0600 Subject: [PATCH 1/5] Update proc-macro-crate. --- borsh-derive/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/borsh-derive/Cargo.toml b/borsh-derive/Cargo.toml index 7e8c5a3ef..fb87bccf9 100644 --- a/borsh-derive/Cargo.toml +++ b/borsh-derive/Cargo.toml @@ -19,7 +19,7 @@ proc-macro = true [dependencies] syn = { version = "2", features = ["full", "fold"] } -proc-macro-crate = "2" +proc-macro-crate = "3" proc-macro2 = "1" quote = "1" once_cell = "1.18.0" From 4b5e5f089c57502f004b4a3ff3c89553bc00bafe Mon Sep 17 00:00:00 2001 From: Seth Westphal Date: Thu, 4 Jan 2024 19:36:16 -0600 Subject: [PATCH 2/5] Update CHANGELOG. --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57591ede4..c666435f9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - impl `BorshSchema` for `Rc` and `Arc`; add doc for `rc` feature ([#268](https://github.com/near/borsh-rs/pull/268)) +### Other +- bump `proc-macro-crate` to 3.0.0 in `borsh-derive` ([#274](https://github.com/near/borsh-rs/pull/274)) + ## [1.2.1](https://github.com/near/borsh-rs/compare/borsh-v1.2.0...borsh-v1.2.1) - 2023-12-06 ### Other From 1f29d37c4bf5e94dc3a248ff319d8c08450c2804 Mon Sep 17 00:00:00 2001 From: Seth Westphal Date: Thu, 4 Jan 2024 19:36:28 -0600 Subject: [PATCH 3/5] Bump checkout version. --- .github/workflows/rust.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index c2d377f6b..4f25b7c1b 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 with: fetch-depth: 0 - name: Install Rust toolchain @@ -50,7 +50,7 @@ jobs: test_exhaustive_checks: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install nightly for exhaustive check tests uses: dtolnay/rust-toolchain@nightly # a failure on this check means, that some of `syn` crate's enums have been extended @@ -64,7 +64,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Run clippy run: cargo clippy --features unstable__schema --benches -- -D clippy::all @@ -72,7 +72,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Run cargo fmt run: cargo fmt --check @@ -83,7 +83,7 @@ jobs: runs-on: ubuntu-20.04 steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: run cargo doc run: RUSTDOCFLAGS="-D warnings" cargo doc --features derive,unstable__schema @@ -93,7 +93,7 @@ jobs: if: github.ref == 'refs/heads/master' steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: fetch-depth: 0 token: ${{ secrets.CUSTOM_GITHUB_TOKEN }} From 1be0815f22b2aea237eda703f3e3a3734f14627a Mon Sep 17 00:00:00 2001 From: Seth Westphal Date: Thu, 4 Jan 2024 19:38:43 -0600 Subject: [PATCH 4/5] Bump MSRV to 1.67.0. --- .github/workflows/rust.yml | 9 +-------- Cargo.toml | 2 +- README.md | 6 +++--- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 4f25b7c1b..670d42ac6 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -20,7 +20,7 @@ jobs: tests: strategy: matrix: - rust_version: [1.66.0, stable] + rust_version: [1.67.0, stable] runs-on: ubuntu-20.04 steps: @@ -36,13 +36,6 @@ jobs: run: rustup default ${{ matrix.rust_version }} - name: print rustc version run: rustc --version - # remove this step when MSRV >= 1.67.0 - - name: downgrade `toml_edit`, time`, `toml_datetime` crate to support older Rust toolchain - if: matrix.rust_version == '1.66.0' - run: | - cargo update -p toml_edit --precise 0.20.2 - cargo update -p toml_datetime --precise 0.6.3 - cargo update -p time --precise 0.3.23 - name: Run tests run: ./.github/test.sh diff --git a/Cargo.toml b/Cargo.toml index 90c2c3f66..725317b3d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,4 +4,4 @@ members = ["borsh", "borsh-derive", "fuzz/fuzz-run", "benchmarks"] [workspace.package] # shared version of all public crates in the workspace version = "1.3.0" -rust-version = "1.66.0" +rust-version = "1.67.0" diff --git a/README.md b/README.md index 96ff7fbfd..88887aa82 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -# Borsh in Rust   [![Latest Version]][crates.io] [![borsh: rustc 1.66+]][Rust 1.66] [![License Apache-2.0 badge]][License Apache-2.0] [![License MIT badge]][License MIT] +# Borsh in Rust   [![Latest Version]][crates.io] [![borsh: rustc 1.67+]][Rust 1.67] [![License Apache-2.0 badge]][License Apache-2.0] [![License MIT badge]][License MIT] [Borsh]: https://borsh.io [Latest Version]: https://img.shields.io/crates/v/borsh.svg [crates.io]: https://crates.io/crates/borsh -[borsh: rustc 1.66+]: https://img.shields.io/badge/rustc-1.66+-lightgray.svg -[Rust 1.66]: https://blog.rust-lang.org/2022/12/15/Rust-1.66.0.html +[borsh: rustc 1.67+]: https://img.shields.io/badge/rustc-1.67+-lightgray.svg +[Rust 1.67]: https://blog.rust-lang.org/2022/12/15/Rust-1.67.0.html [License Apache-2.0 badge]: https://img.shields.io/badge/license-Apache2.0-blue.svg [License Apache-2.0]: https://opensource.org/licenses/Apache-2.0 [License MIT badge]: https://img.shields.io/badge/license-MIT-blue.svg From cd1c24400e458dfa0b57129e76c1c62e7b285838 Mon Sep 17 00:00:00 2001 From: Seth Westphal Date: Tue, 9 Jan 2024 09:03:19 -0600 Subject: [PATCH 5/5] PR feedback. --- CHANGELOG.md | 3 --- README.md | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c666435f9..57591ede4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,9 +12,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - impl `BorshSchema` for `Rc` and `Arc`; add doc for `rc` feature ([#268](https://github.com/near/borsh-rs/pull/268)) -### Other -- bump `proc-macro-crate` to 3.0.0 in `borsh-derive` ([#274](https://github.com/near/borsh-rs/pull/274)) - ## [1.2.1](https://github.com/near/borsh-rs/compare/borsh-v1.2.0...borsh-v1.2.1) - 2023-12-06 ### Other diff --git a/README.md b/README.md index 88887aa82..bb04fd5a1 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [Latest Version]: https://img.shields.io/crates/v/borsh.svg [crates.io]: https://crates.io/crates/borsh [borsh: rustc 1.67+]: https://img.shields.io/badge/rustc-1.67+-lightgray.svg -[Rust 1.67]: https://blog.rust-lang.org/2022/12/15/Rust-1.67.0.html +[Rust 1.67]: https://blog.rust-lang.org/2023/01/26/Rust-1.67.0.html [License Apache-2.0 badge]: https://img.shields.io/badge/license-Apache2.0-blue.svg [License Apache-2.0]: https://opensource.org/licenses/Apache-2.0 [License MIT badge]: https://img.shields.io/badge/license-MIT-blue.svg