diff options
| author | Eric Huss <eric@huss.org> | 2020-07-29 11:02:05 -0700 |
|---|---|---|
| committer | Eric Huss <eric@huss.org> | 2020-07-29 11:02:05 -0700 |
| commit | 89d7906acdf341ac014f152829a7c8e42ecd5fe5 (patch) | |
| tree | 7ed1ea765894bf89e19c6e5117ffa846f0e06421 | |
| parent | 584e83dd5ae7a75b8214560c22eafbcfe153caa6 (diff) | |
| download | rust-89d7906acdf341ac014f152829a7c8e42ecd5fe5.tar.gz rust-89d7906acdf341ac014f152829a7c8e42ecd5fe5.zip | |
Update cargo
| -rw-r--r-- | Cargo.lock | 24 | ||||
| m--------- | src/tools/cargo | 0 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 1 |
3 files changed, 7 insertions, 18 deletions
diff --git a/Cargo.lock b/Cargo.lock index d0ce581343f..03efcb5230c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1120,9 +1120,9 @@ checksum = "45dc39533a6cae6da2b56da48edae506bb767ec07370f86f70fc062e9d435869" [[package]] name = "fwdansi" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34dd4c507af68d37ffef962063dfa1944ce0dd4d5b82043dbab1dabe088610c3" +checksum = "08c1f5787fe85505d1f7777268db5103d80a7a374d2316a7ce262e57baf8f208" dependencies = [ "memchr", "termcolor", @@ -4547,11 +4547,11 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.0.4" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" +checksum = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" dependencies = [ - "wincolor", + "winapi-util", ] [[package]] @@ -5179,9 +5179,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.2" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" +checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" dependencies = [ "winapi 0.3.8", ] @@ -5193,16 +5193,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "wincolor" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba" -dependencies = [ - "winapi 0.3.8", - "winapi-util", -] - -[[package]] name = "ws2_32-sys" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/src/tools/cargo b/src/tools/cargo -Subproject aa6872140ab0fa10f641ab0b981d5330d419e92 +Subproject 974eb438da8ced6e3becda2bbf63d9b643eacde diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 56d2717c304..e50d27f8006 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -178,7 +178,6 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[ "winapi-i686-pc-windows-gnu", "winapi-util", "winapi-x86_64-pc-windows-gnu", - "wincolor", ]; /// Dependency checks. |