extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-01-11 00:38:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

nu-cli ctrl-c feature support. (#3718)

Browse Source 
Seems we do `ctrl` feature checks in `nu-cli` and `nu-command`. We should find a better way to report the enabled features un the `version` command without using the conditionals (or somewhere else)
This commit is contained in:
Andrés N. Robalino 2021-06-30 19:45:27 -05:00 committed by GitHub
parent c36d356f4e
commit bb5ab5d16c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.lock generated
View File

@ -3309,6 +3309,7 @@ dependencies = [
name = "nu-cli" name = "nu-cli"
version = "0.33.1" version = "0.33.1"
dependencies = [ dependencies = [
"ctrlc",
"indexmap", "indexmap",
"log 0.4.14", "log 0.4.14",
"nu-ansi-term", "nu-ansi-term",

2
Cargo.toml
View File

@ -66,7 +66,7 @@ rstest = "0.10.0"
[build-dependencies] [build-dependencies]
[features] [features]
ctrlc-support = ["nu-command/ctrlc"] ctrlc-support = ["nu-cli/ctrlc", "nu-command/ctrlc"]
ptree-support = ["nu-command/ptree"] ptree-support = ["nu-command/ptree"]
rustyline-support = ["nu-cli/rustyline-support", "nu-command/rustyline-support"] rustyline-support = ["nu-cli/rustyline-support", "nu-command/rustyline-support"]
term-support = ["nu-command/term"] term-support = ["nu-command/term"]

1
crates/nu-cli/Cargo.toml
View File

@ -27,6 +27,7 @@ log = "0.4.14"
pretty_env_logger = "0.4.0" pretty_env_logger = "0.4.0"
strip-ansi-escapes = "0.1.0" strip-ansi-escapes = "0.1.0"
rustyline = { version="8.1.0", optional=true } rustyline = { version="8.1.0", optional=true }
ctrlc = { version="3.1.7", optional=true }
shadow-rs = { version="0.5", default-features=false, optional=true } shadow-rs = { version="0.5", default-features=false, optional=true }
serde = { version="1.0.123", features=["derive"] } serde = { version="1.0.123", features=["derive"] }
serde_yaml = "0.8.16" serde_yaml = "0.8.16"

2
crates/nu-command/src/commands/core_commands/version.rs
View File

@ -184,6 +184,8 @@ pub fn version(args: CommandArgs) -> Result<OutputStream, ShellError> {
fn features_enabled() -> Vec<String> { fn features_enabled() -> Vec<String> {
let mut names = vec!["default".to_string()]; let mut names = vec!["default".to_string()];
// NOTE: There should be another way to know
// features on.
#[cfg(feature = "ctrlc")] #[cfg(feature = "ctrlc")]
{ {
names.push("ctrlc".to_string()); names.push("ctrlc".to_string());