diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-06-28 20:32:37 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-06-28 20:32:37 +0100 |
| commit | f7d681df26947eb91597938c6bb113c2c006ff0c (patch) | |
| tree | 04d596ab9f8ae2154b1a30bb611bc91a5445d812 | |
| parent | 117cf0b85bc8022a939fe43054f64aaa35117dd9 (diff) | |
| parent | 3fe0d73670a3ee3c5d33c516fc21db55cf88c9fb (diff) | |
Merge #5112
5112: Update Chalk to released version r=flodiebold a=flodiebold
Co-authored-by: Florian Diebold <[email protected]>
| -rw-r--r-- | Cargo.lock | 20 | ||||
| -rw-r--r-- | crates/ra_hir_ty/Cargo.toml | 4 |
2 files changed, 14 insertions, 10 deletions
diff --git a/Cargo.lock b/Cargo.lock index dc758a1f0..05703d0b6 100644 --- a/Cargo.lock +++ b/Cargo.lock | |||
| @@ -135,8 +135,9 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" | |||
| 135 | 135 | ||
| 136 | [[package]] | 136 | [[package]] |
| 137 | name = "chalk-derive" | 137 | name = "chalk-derive" |
| 138 | version = "0.15.0-dev.0" | 138 | version = "0.15.0" |
| 139 | source = "git+https://github.com/rust-lang/chalk#57037a53f7decc965d25972606c3ea930e9cb39f" | 139 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 140 | checksum = "c7379caa72d04103fcfd9bde5642b816f58e3ffd6a0d39347e9e35a066648226" | ||
| 140 | dependencies = [ | 141 | dependencies = [ |
| 141 | "proc-macro2", | 142 | "proc-macro2", |
| 142 | "quote", | 143 | "quote", |
| @@ -146,8 +147,9 @@ dependencies = [ | |||
| 146 | 147 | ||
| 147 | [[package]] | 148 | [[package]] |
| 148 | name = "chalk-engine" | 149 | name = "chalk-engine" |
| 149 | version = "0.15.0-dev.0" | 150 | version = "0.15.0" |
| 150 | source = "git+https://github.com/rust-lang/chalk#57037a53f7decc965d25972606c3ea930e9cb39f" | 151 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 152 | checksum = "8e8afe48b5663504b485791ab4fae69cf4864869a71ceec9c758fd4d03423722" | ||
| 151 | dependencies = [ | 153 | dependencies = [ |
| 152 | "chalk-derive", | 154 | "chalk-derive", |
| 153 | "chalk-ir", | 155 | "chalk-ir", |
| @@ -157,8 +159,9 @@ dependencies = [ | |||
| 157 | 159 | ||
| 158 | [[package]] | 160 | [[package]] |
| 159 | name = "chalk-ir" | 161 | name = "chalk-ir" |
| 160 | version = "0.15.0-dev.0" | 162 | version = "0.15.0" |
| 161 | source = "git+https://github.com/rust-lang/chalk#57037a53f7decc965d25972606c3ea930e9cb39f" | 163 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 164 | checksum = "231e391a03c1fc45874171d92be9542efedc939bac59d9501ee28b9521feb406" | ||
| 162 | dependencies = [ | 165 | dependencies = [ |
| 163 | "chalk-derive", | 166 | "chalk-derive", |
| 164 | "lazy_static", | 167 | "lazy_static", |
| @@ -166,8 +169,9 @@ dependencies = [ | |||
| 166 | 169 | ||
| 167 | [[package]] | 170 | [[package]] |
| 168 | name = "chalk-solve" | 171 | name = "chalk-solve" |
| 169 | version = "0.15.0-dev.0" | 172 | version = "0.15.0" |
| 170 | source = "git+https://github.com/rust-lang/chalk#57037a53f7decc965d25972606c3ea930e9cb39f" | 173 | source = "registry+https://github.com/rust-lang/crates.io-index" |
| 174 | checksum = "72c969c0fd06ad50538253327ca3445ff02cc9d0209f94c3cbf198ad9d365b48" | ||
| 171 | dependencies = [ | 175 | dependencies = [ |
| 172 | "chalk-derive", | 176 | "chalk-derive", |
| 173 | "chalk-engine", | 177 | "chalk-engine", |
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml index 407322dc1..d6df48db2 100644 --- a/crates/ra_hir_ty/Cargo.toml +++ b/crates/ra_hir_ty/Cargo.toml | |||
| @@ -27,8 +27,8 @@ test_utils = { path = "../test_utils" } | |||
| 27 | 27 | ||
| 28 | scoped-tls = "1" | 28 | scoped-tls = "1" |
| 29 | 29 | ||
| 30 | chalk-solve = { version = "0.15.0-dev.0", git = "https://github.com/rust-lang/chalk" } | 30 | chalk-solve = { version = "0.15.0" } |
| 31 | chalk-ir = { version = "0.15.0-dev.0", git = "https://github.com/rust-lang/chalk" } | 31 | chalk-ir = { version = "0.15.0" } |
| 32 | 32 | ||
| 33 | [dev-dependencies] | 33 | [dev-dependencies] |
| 34 | insta = "0.16.0" | 34 | insta = "0.16.0" |