Skip to content

Commit dfc2e24

Browse files
authored
Merge pull request #7894 from drinkcat/jiff-date-ls
date/ls: Switch from chrono to jiff
2 parents f2579e5 + 66d1e8a commit dfc2e24

File tree

14 files changed

+396
-322
lines changed

14 files changed

+396
-322
lines changed

.github/workflows/CICD.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -653,10 +653,6 @@ jobs:
653653
;;
654654
esac
655655
outputs CARGO_TEST_OPTIONS
656-
# ** pass needed environment into `cross` container (iff `cross` not already configured via "Cross.toml")
657-
if [ "${CARGO_CMD}" = 'cross' ] && [ ! -e "Cross.toml" ] ; then
658-
printf "[build.env]\npassthrough = [\"CI\", \"RUST_BACKTRACE\", \"CARGO_TERM_COLOR\"]\n" > Cross.toml
659-
fi
660656
# * executable for `strip`?
661657
STRIP="strip"
662658
case ${{ matrix.job.target }} in

Cargo.lock

Lines changed: 52 additions & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,6 @@ chrono = { version = "0.4.41", default-features = false, features = [
282282
"alloc",
283283
"clock",
284284
] }
285-
chrono-tz = "0.10.0"
286285
clap = { version = "4.5", features = ["wrap_help", "cargo"] }
287286
clap_complete = "4.4"
288287
clap_mangen = "0.2"
@@ -300,9 +299,13 @@ gcd = "2.3"
300299
glob = "0.3.1"
301300
half = "2.4.1"
302301
hostname = "0.4"
303-
iana-time-zone = "0.1.57"
304302
indicatif = "0.17.8"
305303
itertools = "0.14.0"
304+
jiff = { version = "0.2.10", default-features = false, features = [
305+
"std",
306+
"alloc",
307+
"tz-system",
308+
] }
306309
libc = "0.2.172"
307310
linux-raw-sys = "0.9"
308311
lscolors = { version = "0.20.0", default-features = false, features = [

Cross.toml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# spell-checker:ignore (misc) dpkg noninteractive tzdata
2+
[build]
3+
pre-build = [
4+
"apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install tzdata",
5+
]
6+
[build.env]
7+
passthrough = ["CI", "RUST_BACKTRACE", "CARGO_TERM_COLOR"]

0 commit comments

Comments
 (0)