Skip to content

Replace unmaintained humantime crate with jiff #15290

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 1 commit into from
Mar 10, 2025
Merged

Conversation

oherrala
Copy link
Contributor

@oherrala oherrala commented Mar 10, 2025

The crate humantime appears to be unmaintained. There's open PR in RustSec's advisory-db about this: rustsec/advisory-db#2249

The crates clap and env_logger have already made the switch from humantime to jiff:

The jiff crate is already dependency on cargo via gix (albeit old 0.1 version, but that's probably fixed in next gix release):

jiff v0.1.29
└── gix-date v0.9.3
    ├── gix v0.70.0
    │   └── cargo v0.88.0 (/Users/oherrala/rust/cargo)

This PR shouldn't have any functional change to cargo itself.

@rustbot
Copy link
Collaborator

rustbot commented Mar 10, 2025

r? @ehuss

rustbot has assigned @ehuss.
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

@rustbot rustbot added A-cli Area: Command-line interface, option parsing, etc. A-rebuild-detection Area: rebuild detection and fingerprinting A-timings Area: timings S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Mar 10, 2025
@oherrala oherrala marked this pull request as draft March 10, 2025 20:26
@epage
Copy link
Contributor

epage commented Mar 10, 2025

- [DIRTY] foo v0.0.1 ([ROOT]/foo): the dependency foo was rebuilt ([TIME_DIFF_AFTER_LAST_BUILD])
+ [DIRTY] foo v0.0.1 ([ROOT]/foo): the dependency foo was rebuilt (1741638048.881853669s, PT1S after last build at 1741638047.743836231s)

Our regex at

// Following 3 subs redact:
// "1719325877.527949100s, 61549498ns after last build at 1719325877.466399602s"
// "1719503592.218193216s, 1h 1s after last build at 1719499991.982681034s"
// into "[DIRTY_REASON_NEW_TIME], [DIRTY_REASON_DIFF] after last build at [DIRTY_REASON_OLD_TIME]"
subs.insert(
"[TIME_DIFF_AFTER_LAST_BUILD]",
regex!(r"(?<redacted>[0-9]+(\.[0-9]+)?s, (\s?[0-9]+(\.[0-9]+)?(s|ns|h))+ after last build at [0-9]+(\.[0-9]+)?s)"),
)
.unwrap();
is not matching anymore to redact this test output

@epage epage marked this pull request as ready for review March 10, 2025 20:53
@epage epage enabled auto-merge March 10, 2025 20:53
@epage epage added this pull request to the merge queue Mar 10, 2025
Merged via the queue into rust-lang:master with commit 35cf085 Mar 10, 2025
23 checks passed
@oherrala oherrala deleted the jiff branch March 10, 2025 21:32
@yhx-12243
Copy link

humantime seems resurrected now (1 hour ago).

bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 14, 2025
Update cargo

15 commits in ab1463d632528e39daf35f263e10c14cbe590ce8..6cf8267012570f63d6b86e85a2ae5627de52df9e
2025-03-08 01:45:05 +0000 to 2025-03-14 15:25:36 +0000
- feat(package): add --exclude-lockfile flag (rust-lang/cargo#15234)
- Redox OS is part of the unix family (rust-lang/cargo#15307)
- docs(ref): Mention `x.y.*` as a kind of version requirement to avoid. (rust-lang/cargo#15310)
- fix(run): Disambiguate bins from different packages that share a name (rust-lang/cargo#15298)
- cargo vendor: Add context which workspace failed to resolve (rust-lang/cargo#15297)
- docs(ref): Note that target-edition is deprecated (rust-lang/cargo#15292)
- refactor(toml): Centralize target descriptions (rust-lang/cargo#15291)
- docs(refs): Add `unsafe` to `extern` while using build scripts in Cargo Book (rust-lang/cargo#15294)
- Replace unmaintained humantime crate with jiff (rust-lang/cargo#15290)
- Add terminal integration via ANSI OSC 9;4 sequences (rust-lang/cargo#14615)
- feat: add completions for add --path (rust-lang/cargo#15288)
- Allow `term.progress.when` to default (rust-lang/cargo#15287)
- docs: spelling and grammar fixes (rust-lang/cargo#15284)
- chore(deps): update cargo-semver-checks to v0.40.0 (rust-lang/cargo#15282)
- Typo fixes (rust-lang/cargo#15280)

r? ghost
@rustbot rustbot added this to the 1.87.0 milestone Mar 15, 2025
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
A-cli Area: Command-line interface, option parsing, etc. A-rebuild-detection Area: rebuild detection and fingerprinting A-timings Area: timings S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants