Auto merge of #687 - detrumi:bump-dependencies, r=jackh726

Bump dependencies and propagate tracing features Fixes #686
rust-lang · Feb 27, 2021 · 4e3d174 · 4e3d174
2 parents a925337 + 49e13f6
commit 4e3d174
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 59 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,9 +15,9 @@ bench = []
 
 [dependencies]
 docopt = "1.1.0"
-itertools = "0.9.0"
-rustyline = "6.2.0"
-salsa = "0.15.0"
+itertools = "0.10.0"
+rustyline = { version = "7.1.0", default-features = false }
+salsa = "0.16.0"
 serde = "1.0"
 serde_derive = "1.0"
 

diff --git a/chalk-integration/Cargo.toml b/chalk-integration/Cargo.toml
@@ -11,7 +11,7 @@ publish = false
 
 [dependencies]
 string_cache = "0.8.0"
-salsa = "0.15.0"
+salsa = "0.16.0"
 tracing = "0.1"
 
 chalk-derive = { version = "0.59.0-dev.0", path = "../chalk-derive" }

diff --git a/chalk-recursive/Cargo.toml b/chalk-recursive/Cargo.toml
@@ -9,9 +9,6 @@ readme = "README.md"
 keywords = ["compiler", "traits", "prolog"]
 edition = "2018"
 
-[features]
-default = []
-
 [dependencies]
 rustc-hash = { version = "1.1.0" }
 tracing = "0.1"
@@ -22,3 +19,8 @@ chalk-solve = { version = "0.59.0-dev.0", path = "../chalk-solve" }
 
 [dev-dependencies]
 chalk-integration = { path = "../chalk-integration" }
+
+[features]
+default = ["tracing-full"]
+
+tracing-full = ["chalk-solve/tracing-subscriber", "chalk-solve/tracing-tree"]
diff --git a/chalk-solve/Cargo.toml b/chalk-solve/Cargo.toml
@@ -11,7 +11,7 @@ edition = "2018"
 
 [dependencies]
 ena = "0.14.0"
-itertools = "0.9.0"
+itertools = "0.10.0"
 petgraph = "0.5.1"
 tracing = "0.1"
 tracing-subscriber = { version = "0.2", optional = true }