feat(cargo-util-schemas): Move lockfile schemas #15980

secona · 2025-09-18T05:04:42Z

What does this PR try to resolve?

As part of cargo plumbing commands, we're trying to make lockfiles more accessible to third-party uses. This change moves the lockfile schemas to cargo-util-schemas, where it is previously under cargo and are relatively hidden.

How to test and review this PR?

Commit by commit to see the changes made. My main concern is performance as the implementation repeatedly calls SourceId::from_url and I'm not sure if its negligible.

r? @epage

crates/cargo-util-schemas/src/lib.rs

src/cargo/core/resolver/encode.rs

crates/cargo-util-schemas/src/resolve.rs

Some of the fields are made public to make the moving phase easier. They will be reverted back to private when its done moving over.

simplifies the moving over of the schemas

crates/cargo-util-schemas/src/lockfile.rs

Manifests schemas use `TomlManifest`. To match, we rename the lockfile schemas to `TomlLockfile`

epage

Thanks!

weihanglo · 2025-09-19T20:37:02Z

crates/cargo-util-schemas/src/lockfile.rs

+impl FromStr for TomlLockfilePackageId {
+    type Err = EncodablePackageIdError;
+
+    fn from_str(s: &str) -> Result<TomlLockfilePackageId, Self::Err> {


This parses the v1 lockfile representation for backfilling ckechsums purpose. Should we make it private and add comment around otherwise it gives a false sense if this is how we parse package id.

More like an documentation issue though.

weihanglo · 2025-09-19T20:54:59Z

crates/cargo-util-schemas/src/lockfile.rs

+}
+
+impl TomlLockfileSourceId {
+    pub fn new(source: String) -> Result<Self, EncodableSourceIdError> {


Do we expect user to create SourceId from raw strings?

I know the API is pub because libcargo needs it, but I fee like this may expose an implicit dependency of the shape of source id string, which should be opaque according to our current documentation.

Changing the underlying implmemtation won't be SemVer breaking, but it may break tools relying on it and narrow their supported Rust toolchain versions if using this API.

Anyway, this is all hypothetical.

In cargo plumbing, we use this to parse the source ID generated by cargo, i.e. from dependency resolution results and lockfiles. I imagine users would do the same.

crates/cargo-util-schemas/src/lockfile.rs

### What does this PR try to resolve? Add documentation efforts to the lockfile schemas. Continuation of #15980 ### How to test and review this PR?

- Includes rust-lang/cargo#15980 - Includes rust-lang/cargo#15990

Update cargo submodule 17 commits in 966f94733bbc94ca51ff9f1e4c49ad250ebbdc50..f2932725b045d361ff5f18ba02b1409dd1f44e71 2025-09-16 17:24:45 +0000 to 2025-09-24 11:31:26 +0000 - fix: use `host-tuple` for host target subsitution (rust-lang/cargo#16003) - test(build-std): move away from panic_immediate_abort (rust-lang/cargo#16006) - fix: Sparse URLs in `TomlLockfileSourceId` (rust-lang/cargo#15990) - refactor(gctx): extract toml dotted keys validation (rust-lang/cargo#15998) - feat: Add lint for global use of `hint-mostly-unused` (rust-lang/cargo#15995) - Make GlobalContext Sync (rust-lang/cargo#15967) - chore(deps): update cargo-semver-checks to v0.44.0 (rust-lang/cargo#15993) - fix(frontatter): Only allow horizontal whitespace after fences (rust-lang/cargo#15975) - docs: Add Lockfile schemas docs (rust-lang/cargo#15989) - Add parallel frontend to the build performance guide (rust-lang/cargo#15970) - chore(deps): update msrv (3 versions) to v1.88 (rust-lang/cargo#15988) - chore(deps): update msrv (1 version) to v1.90 (rust-lang/cargo#15984) - feat(cargo-util-schemas): Move lockfile schemas (rust-lang/cargo#15980) - Clarify multiple version requirement behavior (rust-lang/cargo#15979) - Adds ghostty as supported terminal for term integration (OSC 9;4) (rust-lang/cargo#15977) - docs(team): Fixed broken office hours link (rust-lang/cargo#15976) - docs: Clarify git sources vs git registries in source replacement documentation (rust-lang/cargo#15974) r? ghost

secona added 2 commits September 13, 2025 17:53

refactor: move out into_resolve from EncodableResolve

598cfab

refactor: inline EncodableSourceId deserialization

6a97f64

rustbot assigned epage Sep 18, 2025

rustbot added A-dependency-resolution Area: dependency resolution and the resolver A-lockfile Area: Cargo.lock issues S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 18, 2025

epage reviewed Sep 18, 2025

View reviewed changes

crates/cargo-util-schemas/src/lib.rs Show resolved Hide resolved

epage reviewed Sep 18, 2025

View reviewed changes

src/cargo/core/resolver/encode.rs Outdated Show resolved Hide resolved

epage reviewed Sep 18, 2025

View reviewed changes

crates/cargo-util-schemas/src/resolve.rs Outdated Show resolved Hide resolved

epage reviewed Sep 18, 2025

View reviewed changes

crates/cargo-util-schemas/src/resolve.rs Outdated Show resolved Hide resolved

epage reviewed Sep 18, 2025

View reviewed changes

crates/cargo-util-schemas/src/resolve.rs Outdated Show resolved Hide resolved

epage reviewed Sep 18, 2025

View reviewed changes

crates/cargo-util-schemas/src/resolve.rs Outdated Show resolved Hide resolved

epage reviewed Sep 18, 2025

View reviewed changes

crates/cargo-util-schemas/src/resolve.rs Outdated Show resolved Hide resolved

secona added 5 commits September 19, 2025 00:48

refactor: replace SourceId in EncodableSourceId

ef7814f

refactor: make certain fields and methods public

982ee85

refactor: define lockfile errors in cargo-util-schemas

535f773

Some of the fields are made public to make the moving phase easier. They will be reverted back to private when its done moving over.

refactor: change imports of encode

efc42e1

simplifies the moving over of the schemas

refactor: move lockfile schemas to cargo-util-schemas

949e863

secona force-pushed the lockfile-schemas branch from 187383c to 949e863 Compare September 18, 2025 18:16

epage reviewed Sep 18, 2025

View reviewed changes

crates/cargo-util-schemas/src/lockfile.rs Outdated Show resolved Hide resolved

secona added 3 commits September 19, 2025 05:36

feat: add lockfile schema generation

3738481

chore: bump version

d51d7f6

refactor: rename lockfile schemas scheme

703988f

Manifests schemas use `TomlManifest`. To match, we rename the lockfile schemas to `TomlLockfile`

secona mentioned this pull request Sep 16, 2025

Changes to cargo to better support plumbing commands crate-ci/cargo-plumbing#82

Open

1 task

epage approved these changes Sep 19, 2025

View reviewed changes

epage added this pull request to the merge queue Sep 19, 2025

Merged via the queue into rust-lang:master with commit 24ef070 Sep 19, 2025
27 checks passed

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 19, 2025

weihanglo reviewed Sep 19, 2025

View reviewed changes

secona deleted the lockfile-schemas branch September 19, 2025 23:47

secona mentioned this pull request Sep 20, 2025

docs: Add Lockfile schemas docs #15989

Merged

github-merge-queue bot pushed a commit that referenced this pull request Sep 20, 2025

docs: Add Lockfile schemas docs (#15989)

ee515e6

### What does this PR try to resolve? Add documentation efforts to the lockfile schemas. Continuation of #15980 ### How to test and review this PR?

secona mentioned this pull request Sep 20, 2025

refactor: Use lockfile schemas from cargo crate-ci/cargo-plumbing#111

Merged

secona added a commit to secona/cargo-plumbing that referenced this pull request Sep 23, 2025

chore: Update cargo

4b8a9c2

- Includes rust-lang/cargo#15980 - Includes rust-lang/cargo#15990

weihanglo mentioned this pull request Sep 24, 2025

Update cargo submodule rust-lang/rust#146981

Merged

rustbot added this to the 1.92.0 milestone Sep 25, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat(cargo-util-schemas): Move lockfile schemas #15980

feat(cargo-util-schemas): Move lockfile schemas #15980

Uh oh!

secona commented Sep 18, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

epage left a comment

Uh oh!

Uh oh!

weihanglo Sep 19, 2025

Uh oh!

weihanglo Sep 19, 2025

Uh oh!

secona Sep 20, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

feat(cargo-util-schemas): Move lockfile schemas #15980

feat(cargo-util-schemas): Move lockfile schemas #15980

Uh oh!

Conversation

secona commented Sep 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What does this PR try to resolve?

How to test and review this PR?

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

epage left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

weihanglo Sep 19, 2025

Choose a reason for hiding this comment

Uh oh!

weihanglo Sep 19, 2025

Choose a reason for hiding this comment

Uh oh!

secona Sep 20, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

secona commented Sep 18, 2025 •

edited

Loading