Skip to content

Add rust-version to published sub-crates - #3476

Merged
BurntSushi merged 3 commits into
BurntSushi:masterfrom
albatrossflyon-coder:fix/msrv-metadata
Jul 20, 2026
Merged

Add rust-version to published sub-crates#3476
BurntSushi merged 3 commits into
BurntSushi:masterfrom
albatrossflyon-coder:fix/msrv-metadata

Conversation

@albatrossflyon-coder

@albatrossflyon-coder albatrossflyon-coder commented Jul 16, 2026

Copy link
Copy Markdown
Contributor

Fixes #3473

The workspace root Cargo.toml already declares rust-version = "1.85", and every sub-crate uses edition = "2024" (which mechanically requires rustc >= 1.85), but none of the 9 published sub-crates carried their own rust-version field — so it was missing from their individual Cargo.toml on crates.io even though the workspace itself documents the MSRV.

Added rust-version = "1.85" to:

  • crates/cli (grep-cli)
  • crates/globset (globset)
  • crates/grep (grep)
  • crates/ignore (ignore)
  • crates/matcher (grep-matcher)
  • crates/pcre2 (grep-pcre2)
  • crates/printer (grep-printer)
  • crates/regex (grep-regex)
  • crates/searcher (grep-searcher)

Verified cargo metadata --no-deps and cargo check --workspace both succeed with no changes needed elsewhere.

@BurntSushi

BurntSushi commented Jul 17, 2026

Copy link
Copy Markdown
Owner

Can this use rust-version.workspace = true? That way we don't have to repeat all of the version numbers.

@xtqqczze

xtqqczze commented Jul 17, 2026

Copy link
Copy Markdown
Contributor

We don’t currently define [workspace.package] in the root Cargo.toml. We could introduce it just for edition and rust-version, but it would be better to do so as part of a broader refactoring.

@albatrossflyon-coder

albatrossflyon-coder commented Jul 17, 2026

Copy link
Copy Markdown
Contributor Author

Good call — pushed a follow-up commit that centralizes edition/rust-version in a new [workspace.package] table in the root Cargo.toml, with each of the 9 sub-crates now using edition.workspace = true / rust-version.workspace = true instead of hardcoding the values. Values are unchanged (2024 / 1.85), just no longer duplicated 10 times. cargo check -p ripgrep and cargo metadata both pass clean.

@xtqqczze

xtqqczze commented Jul 18, 2026

Copy link
Copy Markdown
Contributor

Conflicts with c035d23.

@albatrossflyon-coder
Add rust-version to published sub-crates
eb7f52a 
The workspace root already declares rust-version = "1.85", and every
sub-crate uses edition = "2024" (which requires rustc >= 1.85 anyway),
but none of the 9 published sub-crates carried their own rust-version
field, so it was missing from their individual Cargo.toml on crates.io.

Fixes BurntSushi#3473
@albatrossflyon-coder
Centralize edition/rust-version via [workspace.package]
0e54779 
Per maintainer feedback on the rust-version PR: rather than hardcoding
edition/rust-version in every sub-crate manifest, define them once in
the root [workspace.package] and have each crate inherit via
edition.workspace = true / rust-version.workspace = true.
@albatrossflyon-coder

albatrossflyon-coder commented Jul 18, 2026

Copy link
Copy Markdown
Contributor Author

Rebased onto master to resolve the conflict with c035d23 (MSRV bump to 1.96). [workspace.package].rust-version now reads 1.96 to match; cargo check and cargo metadata both pass clean on 1.97.1.

xtqqczze
xtqqczze reviewed Jul 18, 2026
View reviewed changes
Comment thread Cargo.toml
"crates/ignore",
]

[workspace.package]

@xtqqczze xtqqczze Jul 18, 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.

nit: Could we move [workspace.package] to the top of the file?

@BurntSushi BurntSushi Jul 18, 2026

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

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

Please move it above [[bin]] but below the [package] section.

This was referenced Jul 20, 2026
Merged
Closed
@BurntSushi

BurntSushi commented Jul 20, 2026

Copy link
Copy Markdown
Owner

I think the main problem preventing me from merging this PR is that Rust 1.96 is fine for ripgrep, but it might be too new for some of the library crates like ignore.

So I guess for globset and ignore (the only two non-grep crates), could you set their rust-version to something lower? Let's go with Rust 1.88 for now, since I think ignore will build for that.

@hyperfinitism hyperfinitism mentioned this pull request Jul 20, 2026
Closed
@albatrossflyon-coder
fix(msrv): pin globset/ignore rust-version to 1.88 instead of workspa…
f3700a0 
…ce default

The workspace rust-version (1.96) is fine for ripgrep itself, but too new
for globset and ignore, which don't need it. Rust 1.88 is the actual
requirement (that's where let-chains stabilized, which a downstream ignore
release already depends on), and both crates build clean under it.
@albatrossflyon-coder

albatrossflyon-coder commented Jul 20, 2026

Copy link
Copy Markdown
Contributor Author

Done — globset and ignore now pin rust-version = \"1.88\" directly instead of inheriting the workspace's 1.96. Verified both build clean under an actual Rust 1.88.0 toolchain (not just an assumption), so 1.88 is a real, confirmed floor for these two, not a guess.

@BurntSushi

BurntSushi commented Jul 20, 2026

Copy link
Copy Markdown
Owner

I don't think it's necessarily a floor. But I think this is fine for now.

@BurntSushi
BurntSushi merged commit a9dc222 into BurntSushi:master Jul 20, 2026
22 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@BurntSushi BurntSushi BurntSushi left review comments
+1 more reviewer
@xtqqczze xtqqczze xtqqczze left review comments
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Specify rust-version in Cargo.toml

3 participants

@albatrossflyon-coder @BurntSushi @xtqqczze