From 4a26719b0c2832d08a8bd6fa9221e2346ca2e417 Mon Sep 17 00:00:00 2001 From: Stefan Holderbach Date: Tue, 26 Sep 2023 18:00:16 +0200 Subject: [PATCH] Bump `dialoguer` to `0.11.0` (#10510) Includes fixes for breaking changes Supersedes #10494 --- Cargo.lock | 5 +++-- crates/nu-command/Cargo.toml | 2 +- crates/nu-command/src/platform/input/list.rs | 12 ++++++------ 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 61d3b1b984..dc0ed24472 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1072,13 +1072,14 @@ dependencies = [ [[package]] name = "dialoguer" -version = "0.10.4" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87" +checksum = "658bce805d770f407bc62102fca7c2c64ceef2fbcb2b8bd19d2765ce093980de" dependencies = [ "console", "fuzzy-matcher", "shell-words", + "thiserror", ] [[package]] diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml index dc06347eec..398f9cb8cb 100644 --- a/crates/nu-command/Cargo.toml +++ b/crates/nu-command/Cargo.toml @@ -38,7 +38,7 @@ chrono-humanize = "0.2.3" chrono-tz = "0.8" crossterm = "0.27" csv = "1.2" -dialoguer = { default-features = false, features = ["fuzzy-select"], version = "0.10" } +dialoguer = { default-features = false, features = ["fuzzy-select"], version = "0.11" } digest = { default-features = false, version = "0.10" } dtparse = "2.0" encoding_rs = "0.8" diff --git a/crates/nu-command/src/platform/input/list.rs b/crates/nu-command/src/platform/input/list.rs index 8d7f4fdf92..8ca0191685 100644 --- a/crates/nu-command/src/platform/input/list.rs +++ b/crates/nu-command/src/platform/input/list.rs @@ -185,13 +185,13 @@ impl Command for InputList { // }; let ans: InteractMode = if call.has_flag("multi") { - let mut multi_select = MultiSelect::new(); //::with_theme(&theme); + let multi_select = MultiSelect::new(); //::with_theme(&theme); InteractMode::Multi( if !prompt.is_empty() { multi_select.with_prompt(&prompt) } else { - &mut multi_select + multi_select } .items(&options) .report(false) @@ -199,13 +199,13 @@ impl Command for InputList { .map_err(|err| ShellError::IOError(format!("{}: {}", INTERACT_ERROR, err)))?, ) } else if call.has_flag("fuzzy") { - let mut fuzzy_select = FuzzySelect::new(); //::with_theme(&theme); + let fuzzy_select = FuzzySelect::new(); //::with_theme(&theme); InteractMode::Single( if !prompt.is_empty() { fuzzy_select.with_prompt(&prompt) } else { - &mut fuzzy_select + fuzzy_select } .items(&options) .default(0) @@ -214,12 +214,12 @@ impl Command for InputList { .map_err(|err| ShellError::IOError(format!("{}: {}", INTERACT_ERROR, err)))?, ) } else { - let mut select = Select::new(); //::with_theme(&theme); + let select = Select::new(); //::with_theme(&theme); InteractMode::Single( if !prompt.is_empty() { select.with_prompt(&prompt) } else { - &mut select + select } .items(&options) .default(0)