Merge branch 'main' into dependabot/cargo/log-0.4.21

valebes · Mar 4, 2024 · 6011f24 · 6011f24
2 parents 2f0b84a + bf7364f
commit 6011f24
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -14,7 +14,7 @@ jobs:
 
       - name:                   Generate code coverage
         run: |
-          cargo +nightly tarpaulin --verbose --engine llvm --features crossbeam --workspace --timeout 120 --out xml
+          cargo +nightly tarpaulin --verbose --features crossbeam --workspace --timeout 120 --out xml
       - name:                   Workaround for codecov/feedback#263
         run: |
           git config --global --add safe.directory "$GITHUB_WORKSPACE" 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,7 @@ debug = false
 
 [dependencies]
 core_affinity = "0.8.1"
-crossbeam-channel = { version = "0.5.11", optional = true }
+crossbeam-channel = { version = "0.5.12", optional = true }
 crossbeam-deque = "0.8.5"
 dyn-clone = "1.0.16"
 log = "0.4.21"
@@ -34,7 +34,7 @@ flume = { version = "0.11.0", optional = true }
 
 [dev-dependencies]
 criterion = {version = "0.5.1", features = ["html_reports"]}
-crossbeam-channel = { version = "0.5.11"}
+crossbeam-channel = { version = "0.5.12"}
 env_logger = "0.11.2"
 rand = "0.8.5"
 raster = {git = "https://github.com/valebes/raster.git"}