Skip to content

Check in Cargo.lock #2482

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
LucaCappelletti94 merged 9 commits into from
Sep 25, 2026
Merged

Check in Cargo.lock #2482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e979cac
Check in Cargo.lock and update dependencies to latest compatible vers…
alamb Sep 3, 2026
2e837c3
Merge remote-tracking branch 'apache/main' into checkin-cargo-lock
alamb Sep 7, 2026
88d6e8a
Merge branch 'main' into checkin-cargo-lock
LucaCappelletti94 Sep 23, 2026
5afca8f
Use sort_by_key for sqlparser_derive sibling ordering
LucaCappelletti94 Sep 24, 2026
4b6abac
Add sqlparser_bench to a workspace sharing Cargo.lock
LucaCappelletti94 Sep 24, 2026
c4cb1dd
Ignore fuzz/Cargo.lock
LucaCappelletti94 Sep 24, 2026
793dd58
Bump .tool-versions to Rust 1.88.0
LucaCappelletti94 Sep 24, 2026
27a60b2
Run CI cargo commands with --locked
LucaCappelletti94 Sep 24, 2026
e9b3ef6
Merge branch 'main' into checkin-cargo-lock
LucaCappelletti94 Sep 24, 2026
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
18 changes: 9 additions & 9 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,23 +49,23 @@ jobs:
- uses: actions/checkout@v4
- name: Setup Rust Toolchain
uses: ./.github/actions/setup-builder
- run: cargo clippy --all-targets --all-features -- -D warnings
- run: cargo clippy --locked --all-targets --all-features -- -D warnings

benchmark-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup Rust Toolchain
uses: ./.github/actions/setup-builder
- run: cd sqlparser_bench && cargo clippy --all-targets --all-features -- -D warnings
- run: cd sqlparser_bench && cargo clippy --locked --all-targets --all-features -- -D warnings

compile:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Setup Rust Toolchain
uses: ./.github/actions/setup-builder
- run: cargo check --all-targets --all-features
- run: cargo check --locked --all-targets --all-features

docs:
runs-on: ubuntu-latest
Expand All @@ -75,7 +75,7 @@ jobs:
- uses: actions/checkout@v4
- name: Setup Rust Toolchain
uses: ./.github/actions/setup-builder
- run: cargo doc --document-private-items --no-deps --workspace --all-features
- run: cargo doc --locked --document-private-items --no-deps --workspace --all-features

compile-no-std:
runs-on: ubuntu-latest
Expand All @@ -85,9 +85,9 @@ jobs:
uses: ./.github/actions/setup-builder
with:
targets: 'thumbv6m-none-eabi'
- run: cargo test --release --no-default-features --test no_std_recursion
- run: cargo check --no-default-features --target thumbv6m-none-eabi
- run: cargo check --no-default-features --features visitor --target thumbv6m-none-eabi
- run: cargo test --locked --release --no-default-features --test no_std_recursion
- run: cargo check --locked --no-default-features --target thumbv6m-none-eabi
- run: cargo check --locked --no-default-features --features visitor --target thumbv6m-none-eabi

test:
strategy:
Expand All @@ -103,7 +103,7 @@ jobs:
rust-version: ${{ matrix.rust }}
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
- name: Test
run: cargo test --all-features
run: cargo test --locked --all-features

coverage:
runs-on: ubuntu-latest
Expand All @@ -118,7 +118,7 @@ jobs:
with:
tool: cargo-llvm-cov
- uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
- run: cargo llvm-cov --all-features --no-report
- run: cargo llvm-cov --locked --all-features --no-report
- run: cargo llvm-cov report --codecov --output-path target/codecov.json
- uses: codecov/codecov-action@303a32d7a59b442fa8d48b6a1cc6825c09c847a5 # v7.1.1
with:
Expand Down
4 changes: 0 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,6 @@
/derive/target/
dev/dist

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here http://doc.crates.io/guide.html#cargotoml-vs-cargolock
Cargo.lock

# These are backup files generated by rustfmt
**/*.rs.bk

Expand Down
2 changes: 1 addition & 1 deletion .tool-versions
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
rust 1.75.0
rust 1.88.0

@alamb alamb Sep 24, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this change the "msrv" of the crate (the minimum supported rust version) or just the versions that run the tests?

@LucaCappelletti94 LucaCappelletti94 Sep 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The .tool-versions bump leaves the crate's MSRV untouched. The crate declares no rust-version in Cargo.toml (maybe we should), so cargo enforces no MSRV for downstream users, and downstream builds resolve their own dependency graph without reading our Cargo.lock. CI does not read .tool-versions either.

The file only selects the toolchain that asdf and mise install for local development in this checkout.

@alamb alamb Sep 24, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The file only selects the toolchain that asdf and mise install for local development in this checkou

I thought it changes the version of rust used for clippy, etc

So that by changing this we will implicitly start testing with a newer version of rust 🤔

@LucaCappelletti94 LucaCappelletti94 Sep 24, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, those tools go by the version specified in CI, which currently is:

datafusion-sqlparser-rs/.github/workflows/rust.yml

Line 95 in 0fd4fa8

rust: [stable, beta, nightly]

@alamb alamb Sep 24, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ok, I think i was confused with rust-toolchain.toml (e.g. https://github.com/apache/arrow-rs/blob/main/rust-toolchain.toml). Sorry about that

Loading
Loading