Fix cargo.lock merge race & pixi.lock in weird state (rerun-io#6469)

GaryLin-007 · May 31, 2024 · defefae · defefae
1 parent 7ecdfcc
commit defefae
Show file tree

Hide file tree

Showing 2 changed files with 322 additions and 322 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -1363,7 +1363,7 @@ version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f476fe445d41c9e991fd07515a6f463074b782242ccf4a5b7b1d1012e70824df"
 dependencies = [
- "bitflags 2.4.1",
+ "bitflags 2.5.0",
  "crossterm_winapi",
  "libc",
  "parking_lot",
@@ -3923,7 +3923,7 @@ checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
 dependencies = [
  "bytes",
  "heck 0.4.1",
- "itertools 0.12.0",
+ "itertools 0.10.5",
  "log",
  "multimap",
  "once_cell",
@@ -3943,7 +3943,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
 dependencies = [
  "anyhow",
- "itertools 0.12.0",
+ "itertools 0.10.5",
  "proc-macro2",
  "quote",
  "syn 2.0.48",