Browse Source

chore(deps): update crates, Rust version and flake.lock

- Update crates to avoid the CVE error in CI
- Update Rust to be able to update the crate with a CVE
  (Rust 1.90: highest supported by OpenBSD right now)
- Update flake.lock to be able to use Rust 1.90 in the CI
ariasuni 3 weeks ago
parent
commit
01f370baf5
6 changed files with 272 additions and 210 deletions
  1. 1 1
      .github/workflows/unit-tests.yml
  2. 236 177
      Cargo.lock
  3. 6 6
      Cargo.toml
  4. 3 1
      benches/my_benchmark.rs
  5. 23 23
      flake.lock
  6. 3 2
      rust-toolchain.toml

+ 1 - 1
.github/workflows/unit-tests.yml

@@ -13,7 +13,7 @@ concurrency:
 env:
   CARGO_TERM_COLOR: always
   RUSTFLAGS: --deny warnings
-  msrv: 1.82
+  msrv: '1.90'
 jobs:
   security_audit:
     runs-on: ubuntu-latest

File diff suppressed because it is too large
+ 236 - 177
Cargo.lock


+ 6 - 6
Cargo.toml

@@ -6,7 +6,7 @@ description = "A modern replacement for ls"
 authors = ["Christina Sørensen <christina@cafkafk.com>"]
 categories = ["command-line-utilities"]
 edition = "2021"
-rust-version = "1.83.0"
+rust-version = "1.90"
 exclude = [
   "/docs/",
   "/devtools/",
@@ -100,11 +100,11 @@ unit-prefix = "0.5.2"
 # palette 0.7.6 is broken: https://github.com/eza-community/eza/pull/1207
 palette = { version = "=0.7.5", default-features = false, features = ["std"] }
 percent-encoding = "2.3.1"
-phf = { version = "0.12.1", features = ["macros"] }
+phf = { version = "0.13.1", features = ["macros"] }
 plist = { version = "1.7.0", default-features = false }
 uutils_term_grid = "0.7.0"
 terminal_size = "0.4.2"
-timeago = { version = "0.4.2", default-features = false }
+timeago = { version = "0.6.0", default-features = false }
 unicode-width = "0.2"
 ansi-width = "0.1.0"
 serde = { version = "1.0.219", features = ["derive"] }
@@ -125,7 +125,7 @@ proc-mounts = "0.3"
 uzers = "0.12.1"
 
 [target.'cfg(target_os = "windows")'.dependencies]
-windows-sys = { version = "0.60.2", features = [
+windows-sys = { version = "0.61.2", features = [
   "Win32_System_Console",
   "Win32_Foundation",
 ] }
@@ -134,8 +134,8 @@ windows-sys = { version = "0.60.2", features = [
 chrono = { version = "0.4.40", default-features = false, features = ["clock"] }
 
 [dev-dependencies]
-criterion = { version = "0.5.1", features = ["html_reports"] }
-trycmd = "0.15"
+criterion = { version = "0.8.2", features = ["html_reports"] }
+trycmd = "1.0"
 
 [features]
 default = ["git"]

+ 3 - 1
benches/my_benchmark.rs

@@ -4,7 +4,9 @@
 // SPDX-FileCopyrightText: 2023-2024 Christina Sørensen, eza contributors
 // SPDX-FileCopyrightText: 2014 Benjamin Sago
 // SPDX-License-Identifier: MIT
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
+use std::hint::black_box;
+
+use criterion::{criterion_group, criterion_main, Criterion};
 
 pub fn criterion_benchmark(c: &mut Criterion) {
     c.bench_function("logger", |b| {

+ 23 - 23
flake.lock

@@ -3,11 +3,11 @@
     "advisory-db": {
       "flake": false,
       "locked": {
-        "lastModified": 1759506957,
-        "narHash": "sha256-czXIV7Yxo4MlBnItk0h6nomIcgUbq0qmOa8a7/fzKjI=",
+        "lastModified": 1771416826,
+        "narHash": "sha256-H3aCNsQtKCHFnAk1c61ZayPki47NNiKwJhEFX6hWAWE=",
         "owner": "rustsec",
         "repo": "advisory-db",
-        "rev": "ce9208c0021cd8a6b66ff4b345171e8eedd0441c",
+        "rev": "93090f9566b6702340d13a7dc3c206b5b5c4559e",
         "type": "github"
       },
       "original": {
@@ -41,15 +41,15 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1747046372,
-        "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
-        "owner": "edolstra",
+        "lastModified": 1767039857,
+        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
+        "owner": "NixOS",
         "repo": "flake-compat",
-        "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
+        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
+        "owner": "NixOS",
         "repo": "flake-compat",
         "type": "github"
       }
@@ -103,11 +103,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1752689277,
-        "narHash": "sha256-uldUBFkZe/E7qbvxa3mH1ItrWZyT6w1dBKJQF/3ZSsc=",
+        "lastModified": 1769799857,
+        "narHash": "sha256-88IFXZ7Sa1vxbz5pty0Io5qEaMQMMUPMonLa3Ls/ss4=",
         "owner": "nix-community",
         "repo": "naersk",
-        "rev": "0e72363d0938b0208d6c646d10649164c43f4d64",
+        "rev": "9d4ed44d8b8cecdceb1d6fd76e74123d90ae6339",
         "type": "github"
       },
       "original": {
@@ -118,11 +118,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1759917807,
-        "narHash": "sha256-WoSazth5EXIJmveWf0zbTMycrgpbLYOth6KhmltMuv0=",
+        "lastModified": 1771177547,
+        "narHash": "sha256-trTtk3WTOHz7hSw89xIIvahkgoFJYQ0G43IlqprFoMA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fb5cf53218b987f2703a5bbc292a030c0fe33443",
+        "rev": "ac055f38c798b0d87695240c7b761b82fc7e5bc2",
         "type": "github"
       },
       "original": {
@@ -173,11 +173,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759523803,
-        "narHash": "sha256-PTod9NG+i3XbbnBKMl/e5uHDBYpwIWivQ3gOWSEuIEM=",
+        "lastModified": 1770726378,
+        "narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "cfc9f7bb163ad8542029d303e599c0f7eee09835",
+        "rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae",
         "type": "github"
       },
       "original": {
@@ -223,11 +223,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1759977258,
-        "narHash": "sha256-hOxEFSEBoqDmJb7BGX1CzT1gvUPK6r+Qs+n3IxBgfTs=",
+        "lastModified": 1771384185,
+        "narHash": "sha256-KvmjUeA7uODwzbcQoN/B8DCZIbhT/Q/uErF1BBMcYnw=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "1d0c6173f57d07db7957b50e799240d4f2d7520f",
+        "rev": "23dd7fa91602a68bd04847ac41bc10af1e6e2fd2",
         "type": "github"
       },
       "original": {
@@ -258,11 +258,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758728421,
-        "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=",
+        "lastModified": 1770228511,
+        "narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
+        "rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
         "type": "github"
       },
       "original": {

+ 3 - 2
rust-toolchain.toml

@@ -1,8 +1,9 @@
 # SPDX-FileCopyrightText: 2024 Christina Sørensen
 # SPDX-License-Identifier: EUPL-1.2
 [toolchain]
-# NOTE: don't forget to update the unit-tests workflow when changing this
-channel = "1.83"
+# NOTE: don't forget to also update Cargo.toml and .github/workflows/unit-tests.yml
+# At the time of writing, 1.90 is the latest version supported by OpenBSD
+channel = "1.90"
 components = [
   "rustfmt",
   "rustc",

Some files were not shown because too many files changed in this diff