chore: bump toolchain, fix conflict
This commit is contained in:
parent
923126348d
commit
5f79583c3c
6
Cargo.lock
generated
6
Cargo.lock
generated
@ -118,12 +118,6 @@ version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "cfg-if"
|
||||
version = "1.0.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "2.33.0"
|
||||
|
@ -1,3 +1,3 @@
|
||||
[toolchain]
|
||||
channel = "nightly-2021-07-23"
|
||||
channel = "nightly-2021-10-20"
|
||||
components = ["rustc-dev"]
|
||||
|
Loading…
x
Reference in New Issue
Block a user