Skip to content

Commit

Permalink
Update console and indicatif deps (#20998)
Browse files Browse the repository at this point in the history
These dependencies were using a git dependency due to unmerged
bug-fixes. These fixes have now been merged and are available in the
latest releases:

- console-rs/console#186
- console-rs/indicatif#608

In addition, I think the commits in question may've disappeared? E.g.
the fresh build on the new CI platform in had this error:
#20997

```
    Updating git repository `https://github.com/tgolsson/console.git`
error: failed to load source for dependency `console`

Caused by:
  Unable to update https://github.com/tgolsson/console.git?rev=5483880905f384679d322e83c37180f122951995#54838809

Caused by:
  revspec '5483880905f384679d322e83c37180f122951995' not found; class=Reference (4); code=NotFound (-3)
```

Thus, this is marked for cherry-picking back to our active branches.
  • Loading branch information
huonw authored and WorkerPants committed Jun 4, 2024
1 parent 9a993cd commit 38fcc03
Show file tree
Hide file tree
Showing 2 changed files with 82 additions and 14 deletions.
85 changes: 80 additions & 5 deletions src/rust/engine/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 2 additions & 9 deletions src/rust/engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ bytes = "1.5"
chrono = "0.4.22"
clap = "3"
colored = "2.0.0"
console = "0.15.7"
console = "0.15.8"
criterion = "0.4"
crossbeam-channel = "0.5"
# TODO: Waiting on https://github.com/Aeledfyr/deepsize/pull/{30,31,32}.
Expand Down Expand Up @@ -255,7 +255,7 @@ hyper = "0.14"
hyper-rustls = "0.24"
ignore = { git = "https://github.com/pantsbuild/ripgrep.git", rev = "0f7e0fdd00ae528745a7fea24a320cae98235341" }
indexmap = "1.9"
indicatif = "0.17"
indicatif = "0.17.8"
internment = "0.6"
itertools = "0.10"
lazy_static = "1"
Expand Down Expand Up @@ -336,13 +336,6 @@ tree-sitter = "0.20.10"
tree-sitter-javascript = "0.20.1"
tree-sitter-python = "0.20.4"

[patch.crates-io]
# https://github.com/console-rs/console/pull/186
console = { version = "0.15.7", git = "https://github.com/tgolsson/console.git", rev = "5483880905f384679d322e83c37180f122951995" }
# https://github.com/console-rs/indicatif/pull/608
indicatif = { version = "0.17.7", git = "https://github.com/tgolsson/indicatif.git", rev = "31890f0ac55f9727d152ad314a78757ccc0142b6" }


# Default lints adopted by most crates in this workspace.

[workspace.lints.rust]
Expand Down

0 comments on commit 38fcc03

Please sign in to comment.