extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2025-08-26 19:09:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make Span mandatory for some fields in ShellError (#16471)

Browse Source 
Some variants of `ShellError` have `Option<Span>` that really don't need
to. This PR removes the `Option` for `ConfigDirNotFound`
and `DisabledOsSupport`.

Also removes `ShellError::InterruptedByUser`, which had exactly one
usage, in favor of the more widely used `ShellError::Interrupted`

Rel: #13005

## Release notes summary - What our users need to know
N/A
This commit is contained in:
rose
2025-08-20 09:56:06 -04:00
committed by GitHub
parent 4f1300bdf6
commit abeb787115
9 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-cli/src/commands/history/history_.rs
View File

@@ -49,7 +49,7 @@ impl Command for History {
};
// todo for sqlite history this command should be an alias to `open ~/.config/nushell/history.sqlite3 | get history`
let Some(history_path) = history.file_path() else {
return Err(ShellError::ConfigDirNotFound { span: Some(head) });
return Err(ShellError::ConfigDirNotFound { span: head });
};
if call.has_flag(engine_state, stack, "clear")? {

13
crates/nu-cli/src/commands/history/history_import.rs
View File

@@ -78,7 +78,7 @@ Note that history item IDs are ignored when importing from file."#
return ok;
};
let Some(current_history_path) = history.file_path() else {
return Err(ShellError::ConfigDirNotFound { span: span.into() });
return Err(ShellError::ConfigDirNotFound { span });
};
if let Some(bak_path) = backup(&current_history_path, span)? {
println!("Backed history to {}", bak_path.display());
@@ -89,8 +89,9 @@ Note that history item IDs are ignored when importing from file."#
HistoryFileFormat::Sqlite => HistoryFileFormat::Plaintext,
HistoryFileFormat::Plaintext => HistoryFileFormat::Sqlite,
};
let src = new_backend(other_format, None)?;
let mut dst = new_backend(history.file_format, Some(current_history_path))?;
let src = new_backend(other_format, None, call.head)?;
let mut dst =
new_backend(history.file_format, Some(current_history_path), call.head)?;
let items = src
.search(SearchQuery::everything(
reedline::SearchDirection::Forward,
@@ -104,7 +105,8 @@ Note that history item IDs are ignored when importing from file."#
_ => {
let input = input.into_iter().map(item_from_value);
import(
new_backend(history.file_format, Some(current_history_path))?.as_mut(),
new_backend(history.file_format, Some(current_history_path), call.head)?
.as_mut(),
input,
)
}
@@ -117,12 +119,13 @@ Note that history item IDs are ignored when importing from file."#
fn new_backend(
format: HistoryFileFormat,
path: Option<PathBuf>,
span: Span,
) -> Result<Box<dyn History>, ShellError> {
let path = match path {
Some(path) => path,
None => {
let Some(mut path) = nu_path::nu_config_dir() else {
return Err(ShellError::ConfigDirNotFound { span: None });
return Err(ShellError::ConfigDirNotFound { span });
};
path.push(format.default_file_name());
path.into_std_path_buf()