diff options
| author | Caleb Cartwright <caleb.cartwright@outlook.com> | 2021-10-19 23:13:06 -0500 |
|---|---|---|
| committer | Caleb Cartwright <caleb.cartwright@outlook.com> | 2021-10-19 23:13:06 -0500 |
| commit | 5f79583c3c83aa3b8a832e4effacb9141de4c2aa (patch) | |
| tree | 8711fc1fcfa4f8ba85586327ff56a38247b6ed26 | |
| parent | 923126348d012e8a81527de84ccb1cb1d9fde75c (diff) | |
| download | rust-5f79583c3c83aa3b8a832e4effacb9141de4c2aa.tar.gz rust-5f79583c3c83aa3b8a832e4effacb9141de4c2aa.zip | |
chore: bump toolchain, fix conflict
| -rw-r--r-- | Cargo.lock | 6 | ||||
| -rw-r--r-- | rust-toolchain | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/Cargo.lock b/Cargo.lock index 8e4f9098965..7263f047477 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -119,12 +119,6 @@ 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" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/rust-toolchain b/rust-toolchain index b0cd4464df8..b19ecbdb07c 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2021-07-23" +channel = "nightly-2021-10-20" components = ["rustc-dev"] |