Skip to content

Update Cargo.toml #313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
varungandhi-src merged 3 commits into from
Mar 31, 2025
Merged

Update Cargo.toml #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a39b5ec
Update Cargo.toml
BenjaminBrienen Mar 10, 2025
0de3506
update lockfile
BenjaminBrienen Mar 10, 2025
371e82f
more 3.7.2
BenjaminBrienen Mar 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .tool-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ golang 1.22.0
nodejs 16.20.2
shellcheck 0.7.1
yarn 1.22.22
rust 1.78.0
rust 1.81.0
python 3.11.9
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@

## Unreleased

- Bumped MSRV to Rust 1.78.0.
Rust SCIP bindings:

- Bumped MSRV to Rust 1.81.0 (https://github.com/sourcegraph/scip/pull/316, https://github.com/sourcegraph/scip/pull/313).
- Bumped the pinned version of the `protobuf` crate to
the latest release v3.7.2.
(https://github.com/sourcegraph/scip/pull/313)

## v0.5.2

Expand Down
104 changes: 29 additions & 75 deletions bindings/rust/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions bindings/rust/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,16 @@ SCIP (pronunciation: "skip") is a language-agnostic protocol for indexing source
repository = "https://github.com/sourcegraph/scip"
readme = "../../README.md"

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

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

[dependencies]
# Keep in sync with dev/proto-generate.sh
protobuf = "=3.7.1"
protobuf = "=3.7.2"

[dev-dependencies]
pretty_assertions = "1.2.1"
Expand Down
4 changes: 2 additions & 2 deletions bindings/rust/src/generated/scip.rs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion cmd/scip/tests/reprolang/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ include = [
"src/*",
]

rust-version = "1.78.0"
rust-version = "1.81.0"

[lib]
path = "bindings/rust/lib.rs"
Expand Down
3 changes: 1 addition & 2 deletions dev/proto-generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ PROTOC_GEN_RUST_VERSION="$(cat bindings/rust/Cargo.toml | grep 'protobuf =' | se
if ! grep -q "$PROTOC_GEN_RUST_VERSION" "./.bin/PROTOC_GEN_RUST_VERSION" \
|| ! test -f "./.bin/bin/protoc-gen-rs"; then
rm -rf .bin
cargo install --root .bin protobuf-codegen --version 3.7.1 --locked
cargo install --root .bin protobuf-codegen --version 3.7.2 --locked
echo "$PROTOC_GEN_RUST_VERSION" > "./.bin/PROTOC_GEN_RUST_VERSION"
fi

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