From 371a95166830a414158eb10efe755c5dfea0f8d6 Mon Sep 17 00:00:00 2001
From: Jonathan Turner <jonathandturner@users.noreply.github.com>
Date: Fri, 14 Aug 2020 16:45:27 +1200
Subject: [PATCH] Split extra (#2348)

* Split default/extra plugins

* Oops, too many deletes

* Pipelines
---
 .azure/azure-pipelines.yml                    | 14 ++++--
 Cargo.lock                                    |  1 -
 Cargo.toml                                    | 43 +++++++++++--------
 crates/nu_plugin_textview/Cargo.toml          |  2 -
 ...table_fetch.rs => nu_plugin_core_fetch.rs} |  0
 ...table_match.rs => nu_plugin_core_match.rs} |  0
 ...table_parse.rs => nu_plugin_core_parse.rs} |  0
 ..._stable_post.rs => nu_plugin_core_post.rs} |  0
 ...yview.rs => nu_plugin_extra_binaryview.rs} |  0
 ...gin_stable_s3.rs => nu_plugin_extra_s3.rs} |  0
 ...able_start.rs => nu_plugin_extra_start.rs} |  0
 ...stable_tree.rs => nu_plugin_extra_tree.rs} |  0
 12 files changed, 34 insertions(+), 26 deletions(-)
 rename src/plugins/{nu_plugin_stable_fetch.rs => nu_plugin_core_fetch.rs} (100%)
 rename src/plugins/{nu_plugin_stable_match.rs => nu_plugin_core_match.rs} (100%)
 rename src/plugins/{nu_plugin_stable_parse.rs => nu_plugin_core_parse.rs} (100%)
 rename src/plugins/{nu_plugin_stable_post.rs => nu_plugin_core_post.rs} (100%)
 rename src/plugins/{nu_plugin_stable_binaryview.rs => nu_plugin_extra_binaryview.rs} (100%)
 rename src/plugins/{nu_plugin_stable_s3.rs => nu_plugin_extra_s3.rs} (100%)
 rename src/plugins/{nu_plugin_stable_start.rs => nu_plugin_extra_start.rs} (100%)
 rename src/plugins/{nu_plugin_stable_tree.rs => nu_plugin_extra_tree.rs} (100%)

diff --git a/.azure/azure-pipelines.yml b/.azure/azure-pipelines.yml
index 4d6de1717c..e3f9f830e3 100644
--- a/.azure/azure-pipelines.yml
+++ b/.azure/azure-pipelines.yml
@@ -9,6 +9,9 @@ strategy:
     linux-minimal:
       image: ubuntu-18.04
       style: 'minimal'
+    linux-extra:
+      image: ubuntu-18.04
+      style: 'extra'
     macos-stable:
       image: macos-10.14
       style: 'unflagged'
@@ -49,21 +52,24 @@ steps:
   #     echo "##vso[task.prependpath]$HOME/.cargo/bin"
   #     rustup component add rustfmt
     displayName: Install Rust
-  - bash: RUSTFLAGS="-D warnings" cargo test --all --features stable
+  - bash: RUSTFLAGS="-D warnings" cargo test --all
     condition: eq(variables['style'], 'unflagged')
     displayName: Run tests
-  - bash: RUSTFLAGS="-D warnings" cargo clippy --all --features=stable -- -D clippy::unwrap_used
+  - bash: RUSTFLAGS="-D warnings" cargo clippy --all -- -D clippy::unwrap_used
     condition: eq(variables['style'], 'unflagged')
     displayName: Check clippy lints
-  - bash: RUSTFLAGS="-D warnings" cargo test --all --features stable
+  - bash: RUSTFLAGS="-D warnings" cargo test --all
     condition: eq(variables['style'], 'canary')
     displayName: Run tests
-  - bash: RUSTFLAGS="-D warnings" cargo clippy --all --features=stable -- -D clippy::unwrap_used
+  - bash: RUSTFLAGS="-D warnings" cargo clippy --all -- -D clippy::unwrap_used
     condition: eq(variables['style'], 'canary')
     displayName: Check clippy lints
   - bash: RUSTFLAGS="-D warnings" cargo test --all --no-default-features
     condition: eq(variables['style'], 'minimal')
     displayName: Run tests
+  - bash: RUSTFLAGS="-D warnings" cargo test --all --features=extra
+    condition: eq(variables['style'], 'extra')
+    displayName: Run tests
   - bash: cargo fmt --all -- --check
     condition: eq(variables['style'], 'fmt')
     displayName: Lint
diff --git a/Cargo.lock b/Cargo.lock
index 3e4fea0b75..33029102d2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3335,7 +3335,6 @@ version = "0.18.2"
 dependencies = [
  "ansi_term 0.12.1",
  "bat",
- "crossterm",
  "nu-cli",
  "nu-errors",
  "nu-plugin",
diff --git a/Cargo.toml b/Cargo.toml
index da2253d8d6..04dc57a948 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -74,8 +74,12 @@ default = [
   "ptree-support",
   "term-support",
   "uuid-support",
+  "match",
+  "post",
+  "fetch"
 ]
-stable = ["default", "binaryview", "match", "tree", "post", "fetch", "clipboard-cli", "trash-support", "start", "bson", "sqlite", "s3"]
+stable = ["default"]
+extra = ["default", "binaryview", "tree", "clipboard-cli", "trash-support", "start", "bson", "sqlite", "s3"]
 
 # Default
 inc = ["semver", "nu_plugin_inc"]
@@ -128,40 +132,41 @@ name = "nu_plugin_core_sys"
 path = "src/plugins/nu_plugin_core_sys.rs"
 required-features = ["sys"]
 
-# Stable plugins
 [[bin]]
-name = "nu_plugin_stable_fetch"
-path = "src/plugins/nu_plugin_stable_fetch.rs"
+name = "nu_plugin_core_fetch"
+path = "src/plugins/nu_plugin_core_fetch.rs"
 required-features = ["fetch"]
 
 [[bin]]
-name = "nu_plugin_stable_binaryview"
-path = "src/plugins/nu_plugin_stable_binaryview.rs"
-required-features = ["binaryview"]
-
-[[bin]]
-name = "nu_plugin_stable_match"
-path = "src/plugins/nu_plugin_stable_match.rs"
+name = "nu_plugin_core_match"
+path = "src/plugins/nu_plugin_core_match.rs"
 required-features = ["match"]
 
 [[bin]]
-name = "nu_plugin_stable_post"
-path = "src/plugins/nu_plugin_stable_post.rs"
+name = "nu_plugin_core_post"
+path = "src/plugins/nu_plugin_core_post.rs"
 required-features = ["post"]
 
+# Extra plugins
+
 [[bin]]
-name = "nu_plugin_stable_tree"
-path = "src/plugins/nu_plugin_stable_tree.rs"
+name = "nu_plugin_extra_binaryview"
+path = "src/plugins/nu_plugin_extra_binaryview.rs"
+required-features = ["binaryview"]
+
+[[bin]]
+name = "nu_plugin_extra_tree"
+path = "src/plugins/nu_plugin_extra_tree.rs"
 required-features = ["tree"]
 
 [[bin]]
-name = "nu_plugin_stable_start"
-path = "src/plugins/nu_plugin_stable_start.rs"
+name = "nu_plugin_extra_start"
+path = "src/plugins/nu_plugin_extra_start.rs"
 required-features = ["start"]
 
 [[bin]]
-name = "nu_plugin_stable_s3"
-path = "src/plugins/nu_plugin_stable_s3.rs"
+name = "nu_plugin_extra_s3"
+path = "src/plugins/nu_plugin_extra_s3.rs"
 required-features = ["s3"]
 
 # Main nu binary
diff --git a/crates/nu_plugin_textview/Cargo.toml b/crates/nu_plugin_textview/Cargo.toml
index 5e17921493..48e78f3b2e 100644
--- a/crates/nu_plugin_textview/Cargo.toml
+++ b/crates/nu_plugin_textview/Cargo.toml
@@ -18,8 +18,6 @@ nu-source = {path = "../nu-source", version = "0.18.2"}
 
 ansi_term = "0.12.1"
 bat = {version = "0.15.4", features = ["regex-fancy", "paging"]}
-
-crossterm = "0.17.5"
 term_size = "0.3.2"
 url = "2.1.1"
 
diff --git a/src/plugins/nu_plugin_stable_fetch.rs b/src/plugins/nu_plugin_core_fetch.rs
similarity index 100%
rename from src/plugins/nu_plugin_stable_fetch.rs
rename to src/plugins/nu_plugin_core_fetch.rs
diff --git a/src/plugins/nu_plugin_stable_match.rs b/src/plugins/nu_plugin_core_match.rs
similarity index 100%
rename from src/plugins/nu_plugin_stable_match.rs
rename to src/plugins/nu_plugin_core_match.rs
diff --git a/src/plugins/nu_plugin_stable_parse.rs b/src/plugins/nu_plugin_core_parse.rs
similarity index 100%
rename from src/plugins/nu_plugin_stable_parse.rs
rename to src/plugins/nu_plugin_core_parse.rs
diff --git a/src/plugins/nu_plugin_stable_post.rs b/src/plugins/nu_plugin_core_post.rs
similarity index 100%
rename from src/plugins/nu_plugin_stable_post.rs
rename to src/plugins/nu_plugin_core_post.rs
diff --git a/src/plugins/nu_plugin_stable_binaryview.rs b/src/plugins/nu_plugin_extra_binaryview.rs
similarity index 100%
rename from src/plugins/nu_plugin_stable_binaryview.rs
rename to src/plugins/nu_plugin_extra_binaryview.rs
diff --git a/src/plugins/nu_plugin_stable_s3.rs b/src/plugins/nu_plugin_extra_s3.rs
similarity index 100%
rename from src/plugins/nu_plugin_stable_s3.rs
rename to src/plugins/nu_plugin_extra_s3.rs
diff --git a/src/plugins/nu_plugin_stable_start.rs b/src/plugins/nu_plugin_extra_start.rs
similarity index 100%
rename from src/plugins/nu_plugin_stable_start.rs
rename to src/plugins/nu_plugin_extra_start.rs
diff --git a/src/plugins/nu_plugin_stable_tree.rs b/src/plugins/nu_plugin_extra_tree.rs
similarity index 100%
rename from src/plugins/nu_plugin_stable_tree.rs
rename to src/plugins/nu_plugin_extra_tree.rs