Skip to content

Commit 1077d0d

Browse files
Bump protobuf-codegen to 3.7.2 in Cargo.toml (#313)
Also bumps the MSRV for simplicity, because we won't be testing things with older versions of Rust in CI.
1 parent c6bfed5 commit 1077d0d

File tree

7 files changed

+44
-87
lines changed

7 files changed

+44
-87
lines changed

.tool-versions

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ golang 1.22.0
22
nodejs 16.20.2
33
shellcheck 0.7.1
44
yarn 1.22.22
5-
rust 1.78.0
5+
rust 1.81.0
66
python 3.11.9

CHANGELOG.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22

33
## Unreleased
44

5-
- Bumped MSRV to Rust 1.78.0.
5+
Rust SCIP bindings:
6+
7+
- Bumped MSRV to Rust 1.81.0 (https://github.com/sourcegraph/scip/pull/316, https://github.com/sourcegraph/scip/pull/313).
8+
- Bumped the pinned version of the `protobuf` crate to
9+
the latest release v3.7.2.
10+
(https://github.com/sourcegraph/scip/pull/313)
611

712
## v0.5.2
813

bindings/rust/Cargo.lock

+29-75
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bindings/rust/Cargo.toml

+4-5
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,16 @@ SCIP (pronunciation: "skip") is a language-agnostic protocol for indexing source
99
repository = "https://github.com/sourcegraph/scip"
1010
readme = "../../README.md"
1111

12-
# We need >= 1.78.0 because: we only test against that
12+
# We need >= 1.81.0 because: we only test against that
1313
# in the CI (we use protobuf-codegen in CI, and that
14-
# has Cargo.lock version 4, which requires Rust >= 1.78.0).
15-
# https://github.com/solana-foundation/anchor/issues/3392#issuecomment-2508412018
16-
rust-version = "1.78.0"
14+
# has [email protected] as a dependency, which requires Rust >= 1.81.0).
15+
rust-version = "1.81.0"
1716

1817
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
1918

2019
[dependencies]
2120
# Keep in sync with dev/proto-generate.sh
22-
protobuf = "=3.7.1"
21+
protobuf = "=3.7.2"
2322

2423
[dev-dependencies]
2524
pretty_assertions = "1.2.1"

bindings/rust/src/generated/scip.rs

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/scip/tests/reprolang/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ include = [
1414
"src/*",
1515
]
1616

17-
rust-version = "1.78.0"
17+
rust-version = "1.81.0"
1818

1919
[lib]
2020
path = "bindings/rust/lib.rs"

dev/proto-generate.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ PROTOC_GEN_RUST_VERSION="$(cat bindings/rust/Cargo.toml | grep 'protobuf =' | se
1212
if ! grep -q "$PROTOC_GEN_RUST_VERSION" "./.bin/PROTOC_GEN_RUST_VERSION" \
1313
|| ! test -f "./.bin/bin/protoc-gen-rs"; then
1414
rm -rf .bin
15-
cargo install --root .bin protobuf-codegen --version 3.7.1 --locked
15+
cargo install --root .bin protobuf-codegen --version 3.7.2 --locked
1616
echo "$PROTOC_GEN_RUST_VERSION" > "./.bin/PROTOC_GEN_RUST_VERSION"
1717
fi
1818

@@ -36,4 +36,3 @@ GOBIN="$PWD/.bin" go install google.golang.org/protobuf/cmd/protoc-gen-go
3636
GOBIN="$PWD/.bin" ./.bin/buf generate
3737
./.bin/goimports -w ./bindings/go/scip/scip.pb.go
3838
yarn run prettier
39-

0 commit comments

Comments
 (0)