summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Turner <jonathandturner@users.noreply.github.com>2019-12-18 10:14:16 -0800
committerGitHub <noreply@github.com>2019-12-18 10:14:16 -0800
commita8425daf1463d20ba892156f0ba1198949d1c4d2 (patch)
tree27398f7897e272fb5f74272dcd5176fe5e10693c
parent91ebb7f718e57ed6d7cf84ee6fc0f43782db2ac7 (diff)
parentb629136528d36167d8a9eb4b163af56088d2dbeb (diff)
Merge pull request #1097 from jonathandturner/fix_workspace0.7.0
Fix the workspace I commented out
-rw-r--r--Cargo.lock1
-rw-r--r--Cargo.toml46
2 files changed, 24 insertions, 23 deletions
diff --git a/Cargo.lock b/Cargo.lock
index a5e164b7d..65c89cd57 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2073,6 +2073,7 @@ dependencies = [
"num-bigint",
"num-traits 0.2.10",
"pretty",
+ "pretty_assertions",
"pretty_env_logger",
"ptree",
"serde 1.0.103",
diff --git a/Cargo.toml b/Cargo.toml
index 9eadc0087..4a91efc3f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,29 +11,29 @@ repository = "https://github.com/nushell/nushell"
homepage = "https://www.nushell.sh"
documentation = "https://www.nushell.sh/book/"
-# [workspace]
-#
-# members = [
-# "crates/nu-macros",
-# "crates/nu-errors",
-# "crates/nu-source",
-# "crates/nu_plugin_average",
-# "crates/nu_plugin_binaryview",
-# "crates/nu_plugin_fetch",
-# "crates/nu_plugin_inc",
-# "crates/nu_plugin_match",
-# "crates/nu_plugin_post",
-# "crates/nu_plugin_ps",
-# "crates/nu_plugin_str",
-# "crates/nu_plugin_sum",
-# "crates/nu_plugin_sys",
-# "crates/nu_plugin_textview",
-# "crates/nu_plugin_tree",
-# "crates/nu-protocol",
-# "crates/nu-parser",
-# "crates/nu-value-ext",
-# "crates/nu-build"
-# ]
+[workspace]
+
+members = [
+ "crates/nu-macros",
+ "crates/nu-errors",
+ "crates/nu-source",
+ "crates/nu_plugin_average",
+ "crates/nu_plugin_binaryview",
+ "crates/nu_plugin_fetch",
+ "crates/nu_plugin_inc",
+ "crates/nu_plugin_match",
+ "crates/nu_plugin_post",
+ "crates/nu_plugin_ps",
+ "crates/nu_plugin_str",
+ "crates/nu_plugin_sum",
+ "crates/nu_plugin_sys",
+ "crates/nu_plugin_textview",
+ "crates/nu_plugin_tree",
+ "crates/nu-protocol",
+ "crates/nu-parser",
+ "crates/nu-value-ext",
+ "crates/nu-build"
+]
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html