Rust 1.85, edition=2024 (#15741)

crates/nu-cli/src/commands/history/history_.rs

@@ -1,5 +1,5 @@
 use nu_engine::command_prelude::*;
-use nu_protocol::{shell_error::io::IoError, HistoryFileFormat};
+use nu_protocol::{HistoryFileFormat, shell_error::io::IoError};
 use reedline::{
     FileBackedHistory, History as ReedlineHistory, HistoryItem, SearchDirection, SearchQuery,
     SqliteBackedHistory,

crates/nu-cli/src/commands/history/history_import.rs

@@ -2,8 +2,8 @@ use std::path::{Path, PathBuf};
 
 use nu_engine::command_prelude::*;
 use nu_protocol::{
-    shell_error::{self, io::IoError},
     HistoryFileFormat,
+    shell_error::{self, io::IoError},
 };
 
 use reedline::{
@@ -48,8 +48,7 @@ Note that history item IDs are ignored when importing from file."#
         vec![
             Example {
                 example: "history import",
-                description:
-                    "Append all items from history in the other format to the current history",
+                description: "Append all items from history in the other format to the current history",
                 result: None,
             },
             Example {
@@ -198,7 +197,7 @@ fn item_from_record(mut rec: Record, span: Span) -> Result<HistoryItem, ShellErr
             return Err(ShellError::TypeMismatch {
                 err_message: format!("missing column: {}", fields::COMMAND_LINE),
                 span,
-            })
+            });
         }
     };
 
@@ -283,7 +282,7 @@ fn backup(path: &Path, span: Span) -> Result<Option<PathBuf>, ShellError> {
                 PathBuf::from(path),
                 "history path exists but is not a file",
             )
-            .into())
+            .into());
         }
         Err(e) if e.kind() == std::io::ErrorKind::NotFound => return Ok(None),
         Err(e) => {
@@ -292,7 +291,7 @@ fn backup(path: &Path, span: Span) -> Result<Option<PathBuf>, ShellError> {
                 "Could not get metadata",
                 nu_protocol::location!(),
             )
-            .into())
+            .into());
         }
     }
     let bak_path = find_backup_path(path, span)?;

crates/nu-cli/src/commands/keybindings_listen.rs

@@ -1,9 +1,9 @@
 use crossterm::{
-    event::Event, event::KeyCode, event::KeyEvent, execute, terminal, QueueableCommand,
+    QueueableCommand, event::Event, event::KeyCode, event::KeyEvent, execute, terminal,
 };
 use nu_engine::command_prelude::*;
 use nu_protocol::shell_error::io::IoError;
-use std::io::{stdout, Write};
+use std::io::{Write, stdout};
 
 #[derive(Clone)]
 pub struct KeybindingsListen;

crates/nu-cli/src/completions/attribute_completions.rs

@@ -1,11 +1,11 @@
-use super::{completion_options::NuMatcher, SemanticSuggestion};
+use super::{SemanticSuggestion, completion_options::NuMatcher};
 use crate::{
-    completions::{Completer, CompletionOptions},
     SuggestionKind,
+    completions::{Completer, CompletionOptions},
 };
 use nu_protocol::{
-    engine::{Stack, StateWorkingSet},
     Span,
+    engine::{Stack, StateWorkingSet},
 };
 use reedline::Suggestion;
 

crates/nu-cli/src/completions/base.rs

@@ -1,7 +1,7 @@
 use crate::completions::CompletionOptions;
 use nu_protocol::{
-    engine::{Stack, StateWorkingSet},
     DeclId, Span,
+    engine::{Stack, StateWorkingSet},
 };
 use reedline::Suggestion;
 

crates/nu-cli/src/completions/cell_path_completions.rs

@@ -3,10 +3,10 @@ use std::borrow::Cow;
 use crate::completions::{Completer, CompletionOptions, SemanticSuggestion, SuggestionKind};
 use nu_engine::{column::get_columns, eval_variable};
 use nu_protocol::{
+    ShellError, Span, Value,
     ast::{Expr, Expression, FullCellPath, PathMember},
     engine::{Stack, StateWorkingSet},
     eval_const::eval_constant,
-    ShellError, Span, Value,
 };
 use reedline::Suggestion;
 

crates/nu-cli/src/completions/command_completions.rs

@@ -1,16 +1,16 @@
 use std::collections::HashMap;
 
 use crate::{
-    completions::{Completer, CompletionOptions},
     SuggestionKind,
+    completions::{Completer, CompletionOptions},
 };
 use nu_protocol::{
-    engine::{CommandType, Stack, StateWorkingSet},
     Span,
+    engine::{CommandType, Stack, StateWorkingSet},
 };
 use reedline::Suggestion;
 
-use super::{completion_options::NuMatcher, SemanticSuggestion};
+use super::{SemanticSuggestion, completion_options::NuMatcher};
 
 pub struct CommandCompletion {
     /// Whether to include internal commands

crates/nu-cli/src/completions/completer.rs

@@ -1,17 +1,17 @@
 use crate::completions::{
-    base::{SemanticSuggestion, SuggestionKind},
     AttributableCompletion, AttributeCompletion, CellPathCompletion, CommandCompletion, Completer,
     CompletionOptions, CustomCompletion, DirectoryCompletion, DotNuCompletion,
     ExportableCompletion, FileCompletion, FlagCompletion, OperatorCompletion, VariableCompletion,
+    base::{SemanticSuggestion, SuggestionKind},
 };
 use nu_color_config::{color_record_to_nustyle, lookup_ansi_color_style};
 use nu_engine::eval_block;
 use nu_parser::{flatten_expression, parse, parse_module_file_or_dir};
 use nu_protocol::{
+    PipelineData, Span, Type, Value,
     ast::{Argument, Block, Expr, Expression, FindMapResult, ListItem, Traverse},
     debugger::WithoutDebug,
     engine::{Closure, EngineState, Stack, StateWorkingSet},
-    PipelineData, Span, Type, Value,
 };
 use reedline::{Completer as ReedlineCompleter, Suggestion};
 use std::sync::Arc;

crates/nu-cli/src/completions/completion_common.rs

@@ -1,16 +1,16 @@
-use super::{completion_options::NuMatcher, MatchAlgorithm};
+use super::{MatchAlgorithm, completion_options::NuMatcher};
 use crate::completions::CompletionOptions;
 use nu_ansi_term::Style;
 use nu_engine::env_to_string;
 use nu_path::dots::expand_ndots;
 use nu_path::{expand_to_real_path, home_dir};
 use nu_protocol::{
-    engine::{EngineState, Stack, StateWorkingSet},
     Span,
+    engine::{EngineState, Stack, StateWorkingSet},
 };
-use nu_utils::get_ls_colors;
 use nu_utils::IgnoreCaseExt;
-use std::path::{is_separator, Component, Path, PathBuf, MAIN_SEPARATOR as SEP};
+use nu_utils::get_ls_colors;
+use std::path::{Component, MAIN_SEPARATOR as SEP, Path, PathBuf, is_separator};
 
 #[derive(Clone, Default)]
 pub struct PathBuiltFromString {

crates/nu-cli/src/completions/completion_options.rs

@@ -2,8 +2,8 @@ use nu_parser::trim_quotes_str;
 use nu_protocol::{CompletionAlgorithm, CompletionSort};
 use nu_utils::IgnoreCaseExt;
 use nucleo_matcher::{
-    pattern::{Atom, AtomKind, CaseMatching, Normalization},
     Config, Matcher, Utf32Str,
+    pattern::{Atom, AtomKind, CaseMatching, Normalization},
 };
 use std::{borrow::Cow, fmt::Display};
 

crates/nu-cli/src/completions/custom_completions.rs

@@ -1,13 +1,13 @@
 use crate::completions::{
-    completer::map_value_completions, Completer, CompletionOptions, MatchAlgorithm,
-    SemanticSuggestion,
+    Completer, CompletionOptions, MatchAlgorithm, SemanticSuggestion,
+    completer::map_value_completions,
 };
 use nu_engine::eval_call;
 use nu_protocol::{
+    DeclId, PipelineData, Span, Type, Value,
     ast::{Argument, Call, Expr, Expression},
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
-    DeclId, PipelineData, Span, Type, Value,
 };
 use std::collections::HashMap;
 
@@ -106,7 +106,9 @@ impl<T: Completer> Completer for CustomCompletion<T> {
                         let positional =
                             options.get("positional").and_then(|val| val.as_bool().ok());
                         if positional.is_some() {
-                            log::warn!("Use of the positional option is deprecated. Use the substring match algorithm instead.");
+                            log::warn!(
+                                "Use of the positional option is deprecated. Use the substring match algorithm instead."
+                            );
                         }
                         if let Some(algorithm) = options
                             .get("completion_algorithm")

crates/nu-cli/src/completions/directory_completions.rs

@@ -1,15 +1,15 @@
 use crate::completions::{
-    completion_common::{adjust_if_intermediate, complete_item, AdjustView},
     Completer, CompletionOptions,
+    completion_common::{AdjustView, adjust_if_intermediate, complete_item},
 };
 use nu_protocol::{
-    engine::{EngineState, Stack, StateWorkingSet},
     Span,
+    engine::{EngineState, Stack, StateWorkingSet},
 };
 use reedline::Suggestion;
 use std::path::Path;
 
-use super::{completion_common::FileSuggestion, SemanticSuggestion, SuggestionKind};
+use super::{SemanticSuggestion, SuggestionKind, completion_common::FileSuggestion};
 
 pub struct DirectoryCompletion;
 

crates/nu-cli/src/completions/dotnu_completions.rs

@@ -1,17 +1,18 @@
 use crate::completions::{
-    completion_common::{surround_remove, FileSuggestion},
+    Completer, CompletionOptions, SemanticSuggestion, SuggestionKind,
+    completion_common::{FileSuggestion, surround_remove},
     completion_options::NuMatcher,
-    file_path_completion, Completer, CompletionOptions, SemanticSuggestion, SuggestionKind,
+    file_path_completion,
 };
 use nu_path::expand_tilde;
 use nu_protocol::{
-    engine::{Stack, StateWorkingSet, VirtualPath},
     Span,
+    engine::{Stack, StateWorkingSet, VirtualPath},
 };
 use reedline::Suggestion;
 use std::{
     collections::HashSet,
-    path::{is_separator, PathBuf, MAIN_SEPARATOR_STR},
+    path::{MAIN_SEPARATOR_STR, PathBuf, is_separator},
 };
 
 pub struct DotNuCompletion {

crates/nu-cli/src/completions/exportable_completions.rs

@@ -1,10 +1,10 @@
 use crate::completions::{
-    completion_common::surround_remove, completion_options::NuMatcher, Completer,
-    CompletionOptions, SemanticSuggestion, SuggestionKind,
+    Completer, CompletionOptions, SemanticSuggestion, SuggestionKind,
+    completion_common::surround_remove, completion_options::NuMatcher,
 };
 use nu_protocol::{
-    engine::{Stack, StateWorkingSet},
     ModuleId, Span,
+    engine::{Stack, StateWorkingSet},
 };
 use reedline::Suggestion;
 

crates/nu-cli/src/completions/file_completions.rs

@@ -1,15 +1,15 @@
 use crate::completions::{
-    completion_common::{adjust_if_intermediate, complete_item, AdjustView},
     Completer, CompletionOptions,
+    completion_common::{AdjustView, adjust_if_intermediate, complete_item},
 };
 use nu_protocol::{
-    engine::{EngineState, Stack, StateWorkingSet},
     Span,
+    engine::{EngineState, Stack, StateWorkingSet},
 };
 use reedline::Suggestion;
 use std::path::Path;
 
-use super::{completion_common::FileSuggestion, SemanticSuggestion, SuggestionKind};
+use super::{SemanticSuggestion, SuggestionKind, completion_common::FileSuggestion};
 
 pub struct FileCompletion;
 

crates/nu-cli/src/completions/flag_completions.rs

@@ -1,9 +1,9 @@
 use crate::completions::{
-    completion_options::NuMatcher, Completer, CompletionOptions, SemanticSuggestion, SuggestionKind,
+    Completer, CompletionOptions, SemanticSuggestion, SuggestionKind, completion_options::NuMatcher,
 };
 use nu_protocol::{
-    engine::{Stack, StateWorkingSet},
     DeclId, Span,
+    engine::{Stack, StateWorkingSet},
 };
 use reedline::Suggestion;
 

crates/nu-cli/src/completions/mod.rs

@@ -24,7 +24,7 @@ pub use custom_completions::CustomCompletion;
 pub use directory_completions::DirectoryCompletion;
 pub use dotnu_completions::DotNuCompletion;
 pub use exportable_completions::ExportableCompletion;
-pub use file_completions::{file_path_completion, FileCompletion};
+pub use file_completions::{FileCompletion, file_path_completion};
 pub use flag_completions::FlagCompletion;
 pub use operator_completions::OperatorCompletion;
 pub use variable_completions::VariableCompletion;

crates/nu-cli/src/completions/operator_completions.rs

@@ -1,10 +1,10 @@
 use crate::completions::{
-    completion_options::NuMatcher, Completer, CompletionOptions, SemanticSuggestion, SuggestionKind,
+    Completer, CompletionOptions, SemanticSuggestion, SuggestionKind, completion_options::NuMatcher,
 };
 use nu_protocol::{
+    ENV_VARIABLE_ID, Span, Type, Value,
     ast::{self, Comparison, Expr, Expression},
     engine::{Stack, StateWorkingSet},
-    Span, Type, Value, ENV_VARIABLE_ID,
 };
 use reedline::Suggestion;
 use strum::{EnumMessage, IntoEnumIterator};

crates/nu-cli/src/completions/variable_completions.rs

@@ -1,7 +1,7 @@
 use crate::completions::{Completer, CompletionOptions, SemanticSuggestion, SuggestionKind};
 use nu_protocol::{
-    engine::{Stack, StateWorkingSet},
     Span, VarId,
+    engine::{Stack, StateWorkingSet},
 };
 use reedline::Suggestion;
 

crates/nu-cli/src/config_files.rs

@@ -2,10 +2,11 @@ use crate::util::eval_source;
 #[cfg(feature = "plugin")]
 use nu_path::canonicalize_with;
 #[cfg(feature = "plugin")]
-use nu_protocol::{engine::StateWorkingSet, ParseError, PluginRegistryFile, Spanned};
+use nu_protocol::{ParseError, PluginRegistryFile, Spanned, engine::StateWorkingSet};
 use nu_protocol::{
+    PipelineData,
     engine::{EngineState, Stack},
-    report_shell_error, PipelineData,
+    report_shell_error,
 };
 #[cfg(feature = "plugin")]
 use nu_utils::perf;
@@ -18,7 +19,7 @@ const OLD_PLUGIN_FILE: &str = "plugin.nu";
 
 #[cfg(feature = "plugin")]
 pub fn read_plugin_file(engine_state: &mut EngineState, plugin_file: Option<Spanned<String>>) {
-    use nu_protocol::{shell_error::io::IoError, ShellError};
+    use nu_protocol::{ShellError, shell_error::io::IoError};
     use std::path::Path;
 
     let span = plugin_file.as_ref().map(|s| s.span);
@@ -230,8 +231,8 @@ pub fn eval_config_contents(
 #[cfg(feature = "plugin")]
 pub fn migrate_old_plugin_file(engine_state: &EngineState) -> bool {
     use nu_protocol::{
-        shell_error::io::IoError, PluginExample, PluginIdentity, PluginRegistryItem,
-        PluginRegistryItemData, PluginSignature, ShellError,
+        PluginExample, PluginIdentity, PluginRegistryItem, PluginRegistryItemData, PluginSignature,
+        ShellError, shell_error::io::IoError,
     };
     use std::collections::BTreeMap;
 

crates/nu-cli/src/eval_cmds.rs

@@ -2,10 +2,11 @@ use log::info;
 use nu_engine::eval_block;
 use nu_parser::parse;
 use nu_protocol::{
+    PipelineData, ShellError, Spanned, Value,
     cli_error::report_compile_error,
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
-    report_parse_error, report_parse_warning, PipelineData, ShellError, Spanned, Value,
+    report_parse_error, report_parse_warning,
 };
 use std::sync::Arc;
 

crates/nu-cli/src/eval_file.rs

@@ -4,12 +4,12 @@ use nu_engine::eval_block;
 use nu_parser::parse;
 use nu_path::canonicalize_with;
 use nu_protocol::{
+    PipelineData, ShellError, Span, Value,
     cli_error::report_compile_error,
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
     report_parse_error, report_parse_warning,
     shell_error::io::*,
-    PipelineData, ShellError, Span, Value,
 };
 use std::{path::PathBuf, sync::Arc};
 

crates/nu-cli/src/lib.rs

@@ -18,7 +18,7 @@ mod validation;
 pub use commands::add_cli_context;
 pub use completions::{FileCompletion, NuCompleter, SemanticSuggestion, SuggestionKind};
 pub use config_files::eval_config_contents;
-pub use eval_cmds::{evaluate_commands, EvaluateCommandsOpts};
+pub use eval_cmds::{EvaluateCommandsOpts, evaluate_commands};
 pub use eval_file::evaluate_file;
 pub use menus::NuHelpCompleter;
 pub use nu_highlight::NuHighlight;

crates/nu-cli/src/menus/help_completions.rs

@@ -1,5 +1,5 @@
-use nu_engine::documentation::{get_flags_section, HelpStyle};
-use nu_protocol::{engine::EngineState, levenshtein_distance, Config};
+use nu_engine::documentation::{HelpStyle, get_flags_section};
+use nu_protocol::{Config, engine::EngineState, levenshtein_distance};
 use nu_utils::IgnoreCaseExt;
 use reedline::{Completer, Suggestion};
 use std::{fmt::Write, sync::Arc};

crates/nu-cli/src/menus/menu_completions.rs

@@ -1,10 +1,10 @@
 use nu_engine::eval_block;
 use nu_protocol::{
+    BlockId, IntoPipelineData, Span, Value,
     debugger::WithoutDebug,
     engine::{EngineState, Stack},
-    BlockId, IntoPipelineData, Span, Value,
 };
-use reedline::{menu_functions::parse_selection_char, Completer, Suggestion};
+use reedline::{Completer, Suggestion, menu_functions::parse_selection_char};
 use std::sync::Arc;
 
 const SELECTION_CHAR: char = '!';

crates/nu-cli/src/prompt_update.rs

@@ -2,8 +2,9 @@ use crate::NushellPrompt;
 use log::{trace, warn};
 use nu_engine::ClosureEvalOnce;
 use nu_protocol::{
+    Config, PipelineData, Value,
     engine::{EngineState, Stack},
-    report_shell_error, Config, PipelineData, Value,
+    report_shell_error,
 };
 use reedline::Prompt;
 

crates/nu-cli/src/reedline_config.rs

@@ -1,19 +1,20 @@
-use crate::{menus::NuMenuCompleter, NuHelpCompleter};
+use crate::{NuHelpCompleter, menus::NuMenuCompleter};
 use crossterm::event::{KeyCode, KeyModifiers};
 use nu_ansi_term::Style;
 use nu_color_config::{color_record_to_nustyle, lookup_ansi_color_style};
 use nu_engine::eval_block;
 use nu_parser::parse;
 use nu_protocol::{
+    Config, EditBindings, FromValue, ParsedKeybinding, ParsedMenu, PipelineData, Record,
+    ShellError, Span, Type, Value,
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
-    extract_value, Config, EditBindings, FromValue, ParsedKeybinding, ParsedMenu, PipelineData,
-    Record, ShellError, Span, Type, Value,
+    extract_value,
 };
 use reedline::{
-    default_emacs_keybindings, default_vi_insert_keybindings, default_vi_normal_keybindings,
     ColumnarMenu, DescriptionMenu, DescriptionMode, EditCommand, IdeMenu, Keybindings, ListMenu,
-    MenuBuilder, Reedline, ReedlineEvent, ReedlineMenu,
+    MenuBuilder, Reedline, ReedlineEvent, ReedlineMenu, default_emacs_keybindings,
+    default_vi_insert_keybindings, default_vi_normal_keybindings,
 };
 use std::sync::Arc;
 

crates/nu-cli/src/repl.rs

@@ -6,12 +6,12 @@ use crate::prompt_update::{
     VSCODE_PRE_EXECUTION_MARKER,
 };
 use crate::{
+    NuHighlighter, NuValidator, NushellPrompt,
     completions::NuCompleter,
     nu_highlight::NoOpHighlighter,
     prompt_update,
-    reedline_config::{add_menus, create_keybindings, KeybindingsMode},
+    reedline_config::{KeybindingsMode, add_menus, create_keybindings},
     util::eval_source,
-    NuHighlighter, NuValidator, NushellPrompt,
 };
 use crossterm::cursor::SetCursorStyle;
 use log::{error, trace, warn};
@@ -24,13 +24,13 @@ use nu_engine::exit::cleanup_exit;
 use nu_parser::{lex, parse, trim_quotes_str};
 use nu_protocol::shell_error::io::IoError;
 use nu_protocol::{
+    HistoryConfig, HistoryFileFormat, PipelineData, ShellError, Span, Spanned, Value,
     config::NuCursorShape,
     engine::{EngineState, Stack, StateWorkingSet},
-    report_shell_error, HistoryConfig, HistoryFileFormat, PipelineData, ShellError, Span, Spanned,
-    Value,
+    report_shell_error,
 };
 use nu_utils::{
-    filesystem::{have_permission, PermissionResult},
+    filesystem::{PermissionResult, have_permission},
     perf,
 };
 use reedline::{
@@ -42,7 +42,7 @@ use std::{
     collections::HashMap,
     env::temp_dir,
     io::{self, IsTerminal, Write},
-    panic::{catch_unwind, AssertUnwindSafe},
+    panic::{AssertUnwindSafe, catch_unwind},
     path::{Path, PathBuf},
     sync::Arc,
     time::{Duration, Instant},
@@ -1451,7 +1451,7 @@ fn are_session_ids_in_sync() {
 
 #[cfg(test)]
 mod test_auto_cd {
-    use super::{do_auto_cd, escape_special_vscode_bytes, parse_operation, ReplOperation};
+    use super::{ReplOperation, do_auto_cd, escape_special_vscode_bytes, parse_operation};
     use nu_path::AbsolutePath;
     use nu_protocol::engine::{EngineState, Stack};
     use tempfile::tempdir;

crates/nu-cli/src/syntax_highlight.rs

@@ -2,11 +2,11 @@ use log::trace;
 use nu_ansi_term::Style;
 use nu_color_config::{get_matching_brackets_style, get_shape_color};
 use nu_engine::env;
-use nu_parser::{flatten_block, parse, FlatShape};
+use nu_parser::{FlatShape, flatten_block, parse};
 use nu_protocol::{
+    Span,
     ast::{Block, Expr, Expression, PipelineRedirection, RecordItem},
     engine::{EngineState, Stack, StateWorkingSet},
-    Span,
 };
 use reedline::{Highlighter, StyledText};
 use std::sync::Arc;

crates/nu-cli/src/util.rs

@@ -2,13 +2,13 @@
 
 use nu_cmd_base::hook::eval_hook;
 use nu_engine::{eval_block, eval_block_with_early_return};
-use nu_parser::{lex, parse, unescape_unquote_string, Token, TokenContents};
+use nu_parser::{Token, TokenContents, lex, parse, unescape_unquote_string};
 use nu_protocol::{
+    PipelineData, ShellError, Span, Value,
     cli_error::report_compile_error,
     debugger::WithoutDebug,
     engine::{EngineState, Stack, StateWorkingSet},
-    report_parse_error, report_parse_warning, report_shell_error, PipelineData, ShellError, Span,
-    Value,
+    report_parse_error, report_parse_warning, report_shell_error,
 };
 #[cfg(windows)]
 use nu_utils::enable_vt_processing;

crates/nu-cli/src/validation.rs

@@ -1,7 +1,7 @@
 use nu_parser::parse;
 use nu_protocol::{
-    engine::{EngineState, StateWorkingSet},
     ParseError,
+    engine::{EngineState, StateWorkingSet},
 };
 use reedline::{ValidationResult, Validator};
 use std::sync::Arc;