Skip to content

Commit

Permalink
Merge branch 'master' into revert-crossbeam
Browse files Browse the repository at this point in the history
  • Loading branch information
sharkdp committed Jan 6, 2022
2 parents e7f192f + c800c79 commit aa6933d
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
24 changes: 12 additions & 12 deletions Cargo.lock

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

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ version_check = "0.9"
ansi_term = "0.12"
atty = "0.2"
ignore = "0.4.3"
num_cpus = "1.8"
num_cpus = "1.13"
regex = "1.5.4"
regex-syntax = "0.6"
ctrlc = "3.2"
Expand All @@ -48,15 +48,15 @@ anyhow = "1.0"
dirs-next = "2.0"
normpath = "0.3"
chrono = "0.4"
once_cell = "1.8.0"
once_cell = "1.9.0"

[dependencies.clap]
version = "2.34.0"
features = ["suggestions", "color", "wrap_help"]

[target.'cfg(unix)'.dependencies]
users = "0.11.0"
nix = "0.23.0"
nix = "0.23.1"

[target.'cfg(all(unix, not(target_os = "redox")))'.dependencies]
libc = "0.2"
Expand Down

0 comments on commit aa6933d

Please sign in to comment.