diff options
| author | Chris Denton <christophersdenton@gmail.com> | 2025-04-12 21:05:28 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-12 21:05:28 +0000 |
| commit | 0149a43f8a6984460d8cc5272dd09dfe0c3c2354 (patch) | |
| tree | bfc972af2754aebbc83ee6bd0818d407ef54e301 /src/tools | |
| parent | 0ea345a3c32b8fc00be5c1805b086bdc93231d60 (diff) | |
| parent | 41fcdab3b5549ed93c87409bcf0b526a39d8b31c (diff) | |
| download | rust-0149a43f8a6984460d8cc5272dd09dfe0c3c2354.tar.gz rust-0149a43f8a6984460d8cc5272dd09dfe0c3c2354.zip | |
Rollup merge of #139315 - clubby789:deranged-bump, r=Mark-Simulacrum
Switch `time` to `jiff` for time formatting in ICE dumps Due to https://github.com/jhpratt/deranged/issues/21, Clippy, R-A and Miri currently fail to build if we bump to 0.4.1, pulled in via `time`. ~~Add some specific type annotations so we don't have to just pin it.~~ ~~I can open 3 PRs to the tool repos if preferred, but I thought it might be easier to do this than to pin the transitive dep and go back and remove it once the changes are synced back.~~
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index bf3b4112324..88c2a02798a 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -269,7 +269,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[ "darling_core", "darling_macro", "datafrog", - "deranged", "derive-where", "derive_setters", "digest", @@ -310,6 +309,8 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[ "intl_pluralrules", "itertools", "itoa", + "jiff", + "jiff-static", "jobserver", "lazy_static", "leb128", @@ -327,7 +328,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[ "miniz_oxide", "nix", "nu-ansi-term", - "num-conv", "num_cpus", "object", "odht", @@ -340,7 +340,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[ "pin-project-lite", "polonius-engine", "portable-atomic", // dependency for platforms doesn't support `AtomicU64` in std - "powerfmt", + "portable-atomic-util", "ppv-lite86", "proc-macro-hack", "proc-macro2", @@ -393,9 +393,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[ "thorin-dwp", "thread_local", "tikv-jemalloc-sys", - "time", - "time-core", - "time-macros", "tinystr", "tinyvec", "tinyvec_macros", |