refactor(parser): Simplify dep source validation by epage · Pull Request #17506 · rust-lang/cargo

epage · 2026-09-24T01:05:35Z

What does this PR try to resolve?

The logic for validating and creating a dependency source is getting a bit complicated as pointed out in #16960.

How to test and review this PR?

Originally, all source creation happened first and then we decided which to use.
The problem with this is it required a registry to be configured even if it was unused.

This is an alternative to #17502

rustbot · 2026-09-24T01:05:40Z

r? @weihanglo

rustbot has assigned @weihanglo.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

Why was this reviewer chosen?

The reviewer was selected based on:

Owners of files modified in this PR: @Muscraft, @epage, @weihanglo
@Muscraft, @epage, @weihanglo expanded to Muscraft, epage, weihanglo
Random selection from Muscraft, weihanglo

epage · 2026-09-24T01:06:22Z

CC @adamgemmell

Because changes the order of evaluation, this is blocked on adding built-in sources.

I also need to write a test for the bug I found with this but not bothering until this is unblocked and rebased..

epage · 2026-09-24T01:07:55Z

I suspect there are other types of validation that could be consolidated into this, including

builtin and version
source-less dep

weihanglo · 2026-09-24T01:14:06Z

-        orig.registry_index.as_ref(),
-    ) {
-        (Some(_git), Some(_path), _, _) => {
+    let git_source = if git.is_some() || branch.is_some() || tag.is_some() || rev.is_some() {


Yeah this looks nicer, and if growing too large, each source construction can be extracted separately.

View changes since the review

adamgemmell · 2026-09-24T16:14:42Z

@epage thanks, this makes a lot of sense. Posted a PR for SourceKind::Builtin here which I think unblocks this? #17513

This case is going to be generalized as an "unused field" warning but panics today because builtin sources panic.

rustbot · 2026-10-08T17:41:13Z

This PR was rebased onto a different master commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

weihanglo

Thanks!

View changes since this review

weihanglo · 2026-10-09T14:25:19Z

+    let path_kind = if let Some(path) = path {
+        Some(path)
+    } else {
+        None
+    };


nit: I guess you just wanted it to be symmetric so didn't do this?

Suggested change

let path_kind = if let Some(path) = path {

Some(path)

} else {

None

};

let path_kind = path

Update cargo submodule 12 commits in 3960fa69bb617e3d93c4ddc087c1b32bf12ad907..15be64aa0859b5c36f7a86d52f7aa0db44ba4d84 2026-10-12 19:29:05 +0000 to 2026-10-20 16:03:21 +0000 - feat(prerelease): support `[patch]` with `-Zprerelease` (rust-lang/cargo#17613) - chore(gh): Overhaul PR template (rust-lang/cargo#17612) - fix(util-schemas): compile out the file-path hint where url can't build it (rust-lang/cargo#17600) - feat(build-std): Add build.build-std.when and crates config keys (rust-lang/cargo#17602) - refactor(confg): Create a config abstraction (rust-lang/cargo#17606) - fix(config): Apply dotted tuple support for rustflags (rust-lang/cargo#17594) - Feat: Shell completion show all the packages having the feature (rust-lang/cargo#17574) - fix(config): Don't load registry config from credentials.toml (rust-lang/cargo#17599) - fix(fingerprint): choose a stable path when source mtimes tie (rust-lang/cargo#17521) - Update gix crates to address CVE-2026-82248, CVE-2026-82249, and CVE-2026-82250, and update git utils.rs to accommodate gix-url v0.38.0. (rust-lang/cargo#17484) - fix: check crate type when pruning `-L` paths (rust-lang/cargo#17589) - refactor(parser): Simplify dep source validation (rust-lang/cargo#17506) r? ghost

rustbot added A-manifest Area: Cargo.toml issues S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Sep 24, 2026

rustbot assigned weihanglo Sep 24, 2026

epage marked this pull request as draft September 24, 2026 01:06

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

weihanglo reviewed Sep 24, 2026

View reviewed changes

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. label Sep 25, 2026

epage added 4 commits September 30, 2026 13:45

test(alt): Ensure versions are always present

44cf928

test(manifest): Verify registry without version behavior

5f5c451

refactor(manifest): Consolidate source checks

40527c3

test(manifest): Allow per-case error messages

a3d05a5

epage force-pushed the validation branch 2 times, most recently from 2080b5f to 9b89531 Compare September 30, 2026 20:02

epage commented Sep 30, 2026

View reviewed changes

Comment thread src/workspace/parser/mod.rs Resolved

epage commented Sep 30, 2026

View reviewed changes

Comment thread src/workspace/parser/mod.rs Resolved

epage added 3 commits September 30, 2026 16:14

test(manifest): Cover builtin+version with other source combo tests

bbd2d2e

test(manifest): Don't cover builtin+registry

b83d8ad

This case is going to be generalized as an "unused field" warning but panics today because builtin sources panic.

test(manifest): Ensure the alt registry is present

02ee713

epage force-pushed the validation branch 2 times, most recently from 5452a29 to d1620e0 Compare September 30, 2026 21:35

epage added 2 commits September 30, 2026 16:58

refactor(parser): Simplify dep source validation

d1b82e9

fix(manifest): Warn when version is missing

b595241

epage force-pushed the validation branch from d1620e0 to 4d1f649 Compare September 30, 2026 22:04

epage marked this pull request as ready for review October 1, 2026 17:16

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 1, 2026

epage removed the S-waiting-on-author Status: The marked PR is awaiting some action (such as code changes) from the PR author. label Oct 8, 2026

epage force-pushed the validation branch from 4d1f649 to b595241 Compare October 8, 2026 17:41

weihanglo approved these changes Oct 14, 2026

View reviewed changes

weihanglo added this pull request to the merge queue Oct 14, 2026

Merged via the queue into rust-lang:master with commit 3773409 Oct 14, 2026
29 checks passed

rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 14, 2026

rustbot mentioned this pull request Oct 14, 2026

fix(install): check if git url contains a rev #15489

Open

weihanglo mentioned this pull request Oct 20, 2026

Update cargo submodule rust-lang/rust#164650

Merged

rustbot added this to the 1.101.0 milestone Oct 22, 2026

Navigation Menu

Repository navigation

refactor(parser): Simplify dep source validation - #17506

refactor(parser): Simplify dep source validation#17506
weihanglo merged 9 commits into
rust-lang:masterfrom
epage:validation

epage commented Sep 24, 2026 •

edited

Loading

Uh oh!

rustbot commented Sep 24, 2026

Uh oh!

epage commented Sep 24, 2026

Uh oh!

epage commented Sep 24, 2026

Uh oh!

weihanglo Sep 24, 2026 •

edited by rustbot

Loading

Uh oh!

adamgemmell commented Sep 24, 2026

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

rustbot commented Oct 8, 2026

Uh oh!

weihanglo left a comment •

edited by rustbot

Loading

Uh oh!

weihanglo Oct 9, 2026

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

epage commented Sep 24, 2026 • 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!

rustbot commented Sep 24, 2026

Uh oh!

epage commented Sep 24, 2026

Uh oh!

epage commented Sep 24, 2026

Uh oh!

weihanglo Sep 24, 2026 • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

adamgemmell commented Sep 24, 2026

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

rustbot commented Oct 8, 2026

Uh oh!

weihanglo left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

weihanglo Oct 9, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

epage commented Sep 24, 2026 •

edited

Loading

weihanglo Sep 24, 2026 •

edited by rustbot

Loading

weihanglo left a comment •

edited by rustbot

Loading