about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJack <jack.huey@umassmed.edu>2020-06-02 17:16:39 -0400
committerJack Huey <jack.huey@umassmed.edu>2020-06-19 14:05:14 -0400
commitb5d5994a4afa73182231efd5d45bbe1fdca28c9b (patch)
treed9fd45c3f89b33c272e5cb2ff0f79464e81aea34
parenta1c769bfd28a217f3110e7dd21ade066e725a90f (diff)
downloadrust-b5d5994a4afa73182231efd5d45bbe1fdca28c9b.tar.gz
rust-b5d5994a4afa73182231efd5d45bbe1fdca28c9b.zip
Update chalk to 0.11.0
-rw-r--r--Cargo.lock20
-rw-r--r--src/librustc_middle/Cargo.toml3
-rw-r--r--src/librustc_traits/Cargo.toml7
3 files changed, 15 insertions, 15 deletions
diff --git a/Cargo.lock b/Cargo.lock
index be516677b52..a6985a2b000 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -434,8 +434,9 @@ dependencies = [
 
 [[package]]
 name = "chalk-derive"
-version = "0.10.1-dev"
-source = "git+https://github.com/rust-lang/chalk.git?rev=ea1ca4ddc43abcfed77420f294a3713fac714e18#ea1ca4ddc43abcfed77420f294a3713fac714e18"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b9bd01eab87277d973183a1d2e56bace1c11f8242c52c20636fb7dddf343ac9"
 dependencies = [
  "proc-macro2 1.0.3",
  "quote 1.0.2",
@@ -445,8 +446,9 @@ dependencies = [
 
 [[package]]
 name = "chalk-engine"
-version = "0.10.1-dev"
-source = "git+https://github.com/rust-lang/chalk.git?rev=ea1ca4ddc43abcfed77420f294a3713fac714e18#ea1ca4ddc43abcfed77420f294a3713fac714e18"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c7a637c3d17ed555aef16e16952a5d1e127bd55178cc30be22afeb92da90c7d"
 dependencies = [
  "chalk-derive",
  "chalk-ir",
@@ -455,8 +457,9 @@ dependencies = [
 
 [[package]]
 name = "chalk-ir"
-version = "0.10.1-dev"
-source = "git+https://github.com/rust-lang/chalk.git?rev=ea1ca4ddc43abcfed77420f294a3713fac714e18#ea1ca4ddc43abcfed77420f294a3713fac714e18"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "595e5735ded16c3f3dc348f7b15bbb2521a0080b1863cac38ad5271589944670"
 dependencies = [
  "chalk-derive",
  "lazy_static",
@@ -464,8 +467,9 @@ dependencies = [
 
 [[package]]
 name = "chalk-solve"
-version = "0.10.1-dev"
-source = "git+https://github.com/rust-lang/chalk.git?rev=ea1ca4ddc43abcfed77420f294a3713fac714e18#ea1ca4ddc43abcfed77420f294a3713fac714e18"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d9d938139db425867a30cc0cfec0269406d8238d0571d829041eaa7a8455d11"
 dependencies = [
  "chalk-derive",
  "chalk-engine",
diff --git a/src/librustc_middle/Cargo.toml b/src/librustc_middle/Cargo.toml
index 9516d449671..21d0b102a4a 100644
--- a/src/librustc_middle/Cargo.toml
+++ b/src/librustc_middle/Cargo.toml
@@ -30,8 +30,7 @@ rustc_serialize = { path = "../librustc_serialize" }
 rustc_ast = { path = "../librustc_ast" }
 rustc_span = { path = "../librustc_span" }
 byteorder = { version = "1.3" }
-chalk-ir =      { git = "https://github.com/rust-lang/chalk.git", rev = "ea1ca4ddc43abcfed77420f294a3713fac714e18" }
-#chalk-ir = "0.10.0"
+chalk-ir = "0.11.0"
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
 measureme = "0.7.1"
 rustc_session = { path = "../librustc_session" }
diff --git a/src/librustc_traits/Cargo.toml b/src/librustc_traits/Cargo.toml
index f141daa9f93..8def98a9603 100644
--- a/src/librustc_traits/Cargo.toml
+++ b/src/librustc_traits/Cargo.toml
@@ -16,11 +16,8 @@ rustc_hir = { path = "../librustc_hir" }
 rustc_index = { path = "../librustc_index" }
 rustc_ast = { path = "../librustc_ast" }
 rustc_span = { path = "../librustc_span" }
-#chalk-ir = "0.10.0"
-#chalk-rust-ir = "0.10.0"
-#chalk-solve = "0.10.0"
-chalk-solve =   { git = "https://github.com/rust-lang/chalk.git", rev = "ea1ca4ddc43abcfed77420f294a3713fac714e18" }
-chalk-ir =      { git = "https://github.com/rust-lang/chalk.git", rev = "ea1ca4ddc43abcfed77420f294a3713fac714e18" }
+chalk-ir = "0.11.0"
+chalk-solve = "0.11.0"
 smallvec = { version = "1.0", features = ["union", "may_dangle"] }
 rustc_infer = { path = "../librustc_infer" }
 rustc_trait_selection = { path = "../librustc_trait_selection" }