chore: bump toolchain, fix conflict

diff --git a/Cargo.lock b/Cargo.lock
index 8e4f90989652700efcabffb016c8ca2af8e3f89c..7263f0474770a4e3798031db17f79e8093c66df8 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -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"

diff --git a/rust-toolchain b/rust-toolchain
index b0cd4464df8e5107f4e674ff8a6a403c9a01d5fe..b19ecbdb07c4f425540264a618144618e7acbcab 100644 (file)
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2021-07-23"
+channel = "nightly-2021-10-20"
 components = ["rustc-dev"]