fix(index): Apply feedback from Cargo team #16369

epage · 2025-12-09T20:01:52Z

What does this PR try to resolve?

Questions from #16270

How should we deal with Summary pubtime parse errors?
- Treat the entry as invalid, rather than recovering since we have no reason to allow other layouts in the future
How strict should we be on the Summary pubtime format?
- Limit to what we specify which is pretty strict
What precision do we want?
- No more than seconds seems the right choice.

Through the conversation, it also came up that we should be very explicit that pubtime is only for publish time and not updates like yanked

How to test and review this PR?

rustbot · 2025-12-09T20:01:57Z

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

epage · 2025-12-09T20:52:21Z

 ---- cache_lock::download_then_mutate stdout ----

thread 'cache_lock::download_then_mutate' (10088) panicked at tests\testsuite\cache_lock.rs:15:5:
test did not finish within 10 attempts (1.0029456s total)
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace


failures:
    cache_lock::download_then_mutate

weihanglo · 2025-12-09T21:22:04Z

cache_lock tests seem becoming flaky recently on Windows MSVC (also happened in #16364 (comment))

0xPoe

Thanks!

View changes since this review

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

tests/testsuite/generate_lockfile.rs

0xPoe

Thanks!

View changes since this review

weihanglo · 2025-12-09T22:54:10Z

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

    /// In ISO8601 with UTC timezone (e.g. 2025-11-12T19:30:12Z)
-    pub pubtime: Option<String>,
+    #[cfg_attr(feature = "unstable-schema", schemars(with = "Option<String>"))]
+    pub pubtime: Option<jiff::Timestamp>,


Do we intend to expose the concrete jiff::Timestamp to users? Should we wrap it with our own type?

(Similar discussion in #15293 (comment). I am fine with either)

My comment from that thread

Yes and we already had this problem with time in the puiblic API. I was just wondering if we should consolidate the breaking changes or going ahead and moving forward. No strong opinion. So long as the serialization format is unchanged, breaking changes to this API are not too big of a deal; the target audience is very small.

Just adding a field is a breaking change so not to worried and adding a custom type seems like boiler plate with little benefit

Thanks. Just want to make sure this is intentional. Also cargo-util-schemas is a package we are not worried about bumping version.

weihanglo · 2025-12-09T23:17:09Z

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


+pub fn parse_pubtime(s: &str) -> Result<jiff::Timestamp, jiff::Error> {
+    let dt = jiff::civil::DateTime::strptime("%Y-%m-%dT%H:%M:%SZ", s)?;
+    if s.len() == 20 {


Cargo isn't future-proof for years beyond 9999 😆

I hope it can last that long! Perhaps this code still is buried in the Arctic mountain at that time🤣

Update cargo submodule 27 commits in 2c283a9a5c5968eeb9a8f12313f04feb1ff8dfac..c46423de7351e3c4c734b2faa86088a9f5d1302b 2025-12-04 16:47:28 +0000 to 2025-12-12 23:16:12 +0000 - feat(report): cargo report timings HTML replay (rust-lang/cargo#16377) - feat: stabilize `-Zconfig-include` (rust-lang/cargo#16284) - fix(package): Don't verify registry for --list (rust-lang/cargo#16341) - Fixed incorrect locking logic when artifact-dir == build-dir (rust-lang/cargo#16385) - feat(log): make timing messages ready for HTML replay (rust-lang/cargo#16382) - chore(deps): update msrv (1 version) to v1.92 (rust-lang/cargo#16381) - Downgrade curl-sys to 0.4.83 (rust-lang/cargo#16379) - fix(timing): more self-contained timing/log data (rust-lang/cargo#16378) - test: update to `proc_macro::tracked::path` (rust-lang/cargo#16380) - refactor(lint): move lints to separate modules (rust-lang/cargo#16364) - fix(index): Apply feedback from Cargo team (rust-lang/cargo#16369) - fix(lints): handle lints separately at ws pkg level (rust-lang/cargo#16367) - feat(lint): new `implicit_minimum_version_req` lint (rust-lang/cargo#16321) - fix(info): default to local without explicit reg (rust-lang/cargo#16358) - Remove `[no-mentions]` handler in our triagebot config (rust-lang/cargo#16361) - Don't read the config file twice when $CARGO_HOME is a symlink (rust-lang/cargo#16325) - fix(timings): forgot to negate filter (rust-lang/cargo#16352) - fix(doctest): Include all search paths with new build layout (rust-lang/cargo#16348) - fix(layout): Remove hashes from bins in new layout (rust-lang/cargo#16351) - docs(faq): Include an entry on disk space (rust-lang/cargo#16349) - feat(timings): derive concurrency data from unit data (rust-lang/cargo#16350) - perf(layout): Use unit_id, not pkg hash, for bin/lib pkg_dirs for new layout (rust-lang/cargo#16345) - Validate target source paths before compilation with clearer errors (rust-lang/cargo#16338) - test(doc): Remove unused build script (rust-lang/cargo#16344) - refactor(timings): store UnitData in RenderContext instead (rust-lang/cargo#16346) - perf(clean): Optimize (legacy) clean with multiple -p specifiers (rust-lang/cargo#16264) - test: Adjust output for out-of-tree build-dir (rust-lang/cargo#16343)

Update cargo submodule 29 commits in 2c283a9a5c5968eeb9a8f12313f04feb1ff8dfac..e91b2baa632c0c7e84216c91ecfe107c37d887c1 2025-12-04 16:47:28 +0000 to 2025-12-13 16:29:21 +0000 - refactor(lints): move from cargo::util::lints to cargo::lints (rust-lang/cargo#16392) - test(lint): redact more due to line got omitted (rust-lang/cargo#16391) - feat(report): cargo report timings HTML replay (rust-lang/cargo#16377) - feat: stabilize `-Zconfig-include` (rust-lang/cargo#16284) - fix(package): Don't verify registry for --list (rust-lang/cargo#16341) - Fixed incorrect locking logic when artifact-dir == build-dir (rust-lang/cargo#16385) - feat(log): make timing messages ready for HTML replay (rust-lang/cargo#16382) - chore(deps): update msrv (1 version) to v1.92 (rust-lang/cargo#16381) - Downgrade curl-sys to 0.4.83 (rust-lang/cargo#16379) - fix(timing): more self-contained timing/log data (rust-lang/cargo#16378) - test: update to `proc_macro::tracked::path` (rust-lang/cargo#16380) - refactor(lint): move lints to separate modules (rust-lang/cargo#16364) - fix(index): Apply feedback from Cargo team (rust-lang/cargo#16369) - fix(lints): handle lints separately at ws pkg level (rust-lang/cargo#16367) - feat(lint): new `implicit_minimum_version_req` lint (rust-lang/cargo#16321) - fix(info): default to local without explicit reg (rust-lang/cargo#16358) - Remove `[no-mentions]` handler in our triagebot config (rust-lang/cargo#16361) - Don't read the config file twice when $CARGO_HOME is a symlink (rust-lang/cargo#16325) - fix(timings): forgot to negate filter (rust-lang/cargo#16352) - fix(doctest): Include all search paths with new build layout (rust-lang/cargo#16348) - fix(layout): Remove hashes from bins in new layout (rust-lang/cargo#16351) - docs(faq): Include an entry on disk space (rust-lang/cargo#16349) - feat(timings): derive concurrency data from unit data (rust-lang/cargo#16350) - perf(layout): Use unit_id, not pkg hash, for bin/lib pkg_dirs for new layout (rust-lang/cargo#16345) - Validate target source paths before compilation with clearer errors (rust-lang/cargo#16338) - test(doc): Remove unused build script (rust-lang/cargo#16344) - refactor(timings): store UnitData in RenderContext instead (rust-lang/cargo#16346) - perf(clean): Optimize (legacy) clean with multiple -p specifiers (rust-lang/cargo#16264) - test: Adjust output for out-of-tree build-dir (rust-lang/cargo#16343)

epage added 2 commits December 9, 2025 13:27

test(lockfile): Ensure no_time case doesn't have time

a0dc7eb

test(index): Show parse error behavior

fd294ac

rustbot assigned weihanglo Dec 9, 2025

rustbot added A-cli Area: Command-line interface, option parsing, etc. A-registries Area: registries labels Dec 9, 2025

rustbot added Command-generate-lockfile S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 9, 2025

epage mentioned this pull request Dec 9, 2025

Tracking Issue for _pubtime_ #16270

Open

3 tasks

epage added 4 commits December 9, 2025 14:04

fix(index): Validate pubtime on parse

7bccc12

test(index): Show parse behavior

9a3f316

fix(index): Be conservative on datetime formats

b8e73e6

docs(index): Specify pubtime is independent of updates

e31f446

epage force-pushed the pubtime branch from 5243e5e to e31f446 Compare December 9, 2025 20:06

chore(schemas): Bump version

73ae7d5

0xPoe reviewed Dec 9, 2025

View reviewed changes

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

tests/testsuite/generate_lockfile.rs Show resolved Hide resolved

0xPoe approved these changes Dec 9, 2025

View reviewed changes

0xPoe added this pull request to the merge queue Dec 9, 2025

weihanglo reviewed Dec 9, 2025

View reviewed changes

0xPoe removed this pull request from the merge queue due to a manual request Dec 9, 2025

weihanglo reviewed Dec 9, 2025

View reviewed changes

weihanglo approved these changes Dec 10, 2025

View reviewed changes

weihanglo added this pull request to the merge queue Dec 10, 2025

Merged via the queue into rust-lang:master with commit 334b7b6 Dec 10, 2025
53 of 58 checks passed

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

epage deleted the pubtime branch December 10, 2025 01:57

weihanglo mentioned this pull request Dec 12, 2025

Update cargo submodule rust-lang/rust#149934

Merged

rustbot added this to the 1.94.0 milestone Dec 13, 2025

fix(index): Apply feedback from Cargo team #16369

fix(index): Apply feedback from Cargo team #16369

Uh oh!

Conversation

epage commented Dec 9, 2025

What does this PR try to resolve?

How to test and review this PR?

Uh oh!

rustbot commented Dec 9, 2025

Uh oh!

epage commented Dec 9, 2025

Uh oh!

weihanglo commented Dec 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

0xPoe 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!

Uh oh!

Uh oh!

0xPoe 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 Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

epage Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

weihanglo Dec 10, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

weihanglo Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

0xPoe Dec 9, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

weihanglo commented Dec 9, 2025 •

edited

Loading

0xPoe left a comment •

edited by rustbot

Loading

0xPoe left a comment •

edited by rustbot

Loading