From f14f4e39c5a32b505656d01de8a7bf5aadb8b190 Mon Sep 17 00:00:00 2001
From: Jonathan Turner <jonathandturner@users.noreply.github.com>
Date: Wed, 7 Oct 2020 11:21:24 +1300
Subject: [PATCH] Begin adding wasi support (#2643)

* Begin adding wasi support

* Now it builds and runs but needs more help
---
 Cargo.lock               |  8 ++++++--
 Cargo.toml               | 22 ++++++++++++----------
 crates/nu-cli/Cargo.toml |  1 +
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index d408c0295f..97d2cb0da4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2228,9 +2228,12 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b141fdc7836c525d4d594027d318c84161ca17aaf8113ab1f81ab93ae897485"
+checksum = "63312a18f7ea8760cdd0a7c5aac1a619752a246b833545e3e36d1f81f7cd9e66"
+dependencies = [
+ "cfg-if",
+]
 
 [[package]]
 name = "iovec"
@@ -2931,6 +2934,7 @@ dependencies = [
  "ical",
  "ichwh",
  "indexmap",
+ "instant",
  "itertools",
  "log 0.4.11",
  "meval",
diff --git a/Cargo.toml b/Cargo.toml
index f11ace55c6..68c9c6bf93 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,8 +27,8 @@ nu-protocol = {version = "0.20.0", path = "./crates/nu-protocol"}
 nu-source = {version = "0.20.0", path = "./crates/nu-source"}
 nu-value-ext = {version = "0.20.0", path = "./crates/nu-value-ext"}
 
-nu_plugin_chart = {version = "0.20.0", path = "./crates/nu_plugin_chart", optional = true}
 nu_plugin_binaryview = {version = "0.20.0", path = "./crates/nu_plugin_binaryview", optional = true}
+nu_plugin_chart = {version = "0.20.0", path = "./crates/nu_plugin_chart", optional = true}
 nu_plugin_fetch = {version = "0.20.0", path = "./crates/nu_plugin_fetch", optional = true}
 nu_plugin_from_bson = {version = "0.20.0", path = "./crates/nu_plugin_from_bson", optional = true}
 nu_plugin_from_sqlite = {version = "0.20.0", path = "./crates/nu_plugin_from_sqlite", optional = true}
@@ -46,14 +46,14 @@ nu_plugin_tree = {version = "0.20.0", path = "./crates/nu_plugin_tree", optional
 
 # Required to bootstrap the main binary
 clap = "2.33.3"
-ctrlc = "3.1.6"
+ctrlc = {version = "3.1.6", optional = true}
 futures = {version = "0.3.5", features = ["compat", "io-compat"]}
 log = "0.4.11"
 pretty_env_logger = "0.4.0"
 
 [dev-dependencies]
-nu-test-support = {version = "0.20.0", path = "./crates/nu-test-support"}
 dunce = "1.0.1"
+nu-test-support = {version = "0.20.0", path = "./crates/nu-test-support"}
 
 [build-dependencies]
 serde = {version = "1.0.115", features = ["derive"]}
@@ -91,27 +91,29 @@ default = [
 extra = ["default", "binaryview", "tree", "clipboard-cli", "trash-support", "start", "bson", "sqlite", "s3", "chart"]
 stable = ["default"]
 
+wasi = ["inc", "match", "directories-support", "ptree-support", "match", "tree", "rustyline-support"]
+
 trace = ["nu-parser/trace"]
 
 # Stable (Default)
+fetch = ["nu_plugin_fetch"]
 inc = ["nu_plugin_inc"]
+match = ["nu_plugin_match"]
+post = ["nu_plugin_post"]
 ps = ["nu_plugin_ps"]
 sys = ["nu_plugin_sys"]
 textview = ["nu_plugin_textview"]
-fetch = ["nu_plugin_fetch"]
-match = ["nu_plugin_match"]
-post = ["nu_plugin_post"]
 
 # Extra
+binaryview = ["nu_plugin_binaryview"]
 bson = ["nu_plugin_from_bson", "nu_plugin_to_bson"]
 chart = ["nu_plugin_chart"]
-binaryview = ["nu_plugin_binaryview"]
 clipboard-cli = ["nu-cli/clipboard-cli"]
-trash-support = ["nu-cli/trash-support"]
-start = ["nu_plugin_start"]
-tree = ["nu_plugin_tree"]
 s3 = ["nu_plugin_s3"]
 sqlite = ["nu_plugin_from_sqlite", "nu_plugin_to_sqlite"]
+start = ["nu_plugin_start"]
+trash-support = ["nu-cli/trash-support"]
+tree = ["nu_plugin_tree"]
 
 # Core plugins that ship with `cargo install nu` by default
 # Currently, Cargo limits us to installing only one binary
diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml
index 9b55e51cf8..8930569114 100644
--- a/crates/nu-cli/Cargo.toml
+++ b/crates/nu-cli/Cargo.toml
@@ -52,6 +52,7 @@ htmlescape = "0.3.1"
 ical = "0.6.0"
 ichwh = {version = "0.3.4", optional = true}
 indexmap = {version = "1.6.0", features = ["serde-1"]}
+instant = "0.1.7"
 itertools = "0.9.0"
 log = "0.4.11"
 meval = "0.2.0"