Upgrade rust edition

Author: pksunkara

.vscode/settings.json

@@ -1,3 +1,3 @@
 {
-    "rust-analyzer.checkOnSave.command": "clippy"
-}
+  "rust-analyzer.cargo.features": "all"
+}

Cargo.toml

@@ -2,16 +2,16 @@
 name = "dialoguer"
 description = "A command line prompting library."
 version = "0.10.4"
-edition = "2018"
+edition = "2021"
 authors = [
 	"Armin Ronacher <armin.ronacher@active-4.com>",
 	"Pavan Kumar Sunkara <pavan.sss1991@gmail.com>"
 ]
 keywords = ["cli", "menu", "prompt"]
 categories = ["command-line-interface"]
 license = "MIT"
-homepage = "https://github.com/mitsuhiko/dialoguer"
-repository = "https://github.com/mitsuhiko/dialoguer"
+homepage = "https://github.com/console-rs/dialoguer"
+repository = "https://github.com/console-rs/dialoguer"
 documentation = "https://docs.rs/dialoguer"
 readme = "README.md"
 

src/prompts/password.rs

@@ -15,7 +15,7 @@ type PasswordValidatorCallback<'a> = Box<dyn Fn(&String) -> Option<String> + 'a>
 /// ## Example usage
 ///
 /// ```rust,no_run
-/// # fn test() -> Result<(), Box<std::error::Error>> {
+/// # fn test() -> Result<(), Box<dyn std::error::Error>> {
 /// use dialoguer::Password;
 ///
 /// let password = Password::new().with_prompt("New Password")

src/theme.rs

@@ -222,8 +222,8 @@ pub trait Theme {
         write!(f, "{} ", if active { ">" } else { " " })?;
 
         if highlight_matches {
-            if let Some((_score, indices)) = matcher.fuzzy_indices(text, &search_term) {
-                for (idx, c) in text.chars().into_iter().enumerate() {
+            if let Some((_score, indices)) = matcher.fuzzy_indices(text, search_term) {
+                for (idx, c) in text.chars().enumerate() {
                     if indices.contains(&idx) {
                         write!(f, "{}", style(c).for_stderr().bold())?;
                     } else {
@@ -248,7 +248,7 @@ pub trait Theme {
         cursor_pos: usize,
     ) -> fmt::Result {
         if !prompt.is_empty() {
-            write!(f, "{} ", prompt,)?;
+            write!(f, "{} ", prompt)?;
         }
 
         if cursor_pos < search_term.len() {
@@ -258,7 +258,7 @@ pub trait Theme {
             write!(f, "{}{}{}", st_head, st_cursor, st_tail)
         } else {
             let cursor = "|".to_string();
-            write!(f, "{}{}", search_term.to_string(), cursor)
+            write!(f, "{}{}", search_term, cursor)
         }
     }
 }
@@ -636,8 +636,8 @@ impl Theme for ColorfulTheme {
         )?;
 
         if highlight_matches {
-            if let Some((_score, indices)) = matcher.fuzzy_indices(text, &search_term) {
-                for (idx, c) in text.chars().into_iter().enumerate() {
+            if let Some((_score, indices)) = matcher.fuzzy_indices(text, search_term) {
+                for (idx, c) in text.chars().enumerate() {
                     if indices.contains(&idx) {
                         if active {
                             write!(
@@ -649,12 +649,10 @@ impl Theme for ColorfulTheme {
                         } else {
                             write!(f, "{}", self.fuzzy_match_highlight_style.apply_to(c))?;
                         }
+                    } else if active {
+                        write!(f, "{}", self.active_item_style.apply_to(c))?;
                     } else {
-                        if active {
-                            write!(f, "{}", self.active_item_style.apply_to(c))?;
-                        } else {
-                            write!(f, "{}", c)?;
-                        }
+                        write!(f, "{}", c)?;
                     }
                 }
 
@@ -696,13 +694,7 @@ impl Theme for ColorfulTheme {
             )
         } else {
             let cursor = self.fuzzy_cursor_style.apply_to(" ");
-            write!(
-                f,
-                "{} {}{}",
-                &self.prompt_suffix,
-                search_term.to_string(),
-                cursor
-            )
+            write!(f, "{} {}{}", &self.prompt_suffix, search_term, cursor)
         }
     }
 }