Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[workspace]
resolver = "2"
resolver = "3"
members = [ "crates/*"]

[workspace.package]
repository = "https://github.com/assert-rs/completest"
license = "MIT OR Apache-2.0"
edition = "2021"
rust-version = "1.70.0" # MSRV
edition = "2024"
rust-version = "1.85.0" # MSRV
include = [
"build.rs",
"src/**/*",
Expand Down
18 changes: 6 additions & 12 deletions crates/completest-nu/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ use nu_cli::NuCompleter;
use nu_command::add_shell_command_context;
use nu_parser::parse;
use nu_protocol::{
engine::{EngineState, Stack, StateWorkingSet},
Value,
engine::{EngineState, Stack, StateWorkingSet},
};
use reedline::Completer;

Expand Down Expand Up @@ -181,30 +181,24 @@ fn external_completion(
let mut working_set = StateWorkingSet::new(&engine_state);
let block = parse(&mut working_set, None, completer.as_bytes(), false);
if !working_set.parse_errors.is_empty() {
return Err(std::io::Error::new(
std::io::ErrorKind::Other,
working_set.parse_errors.remove(0),
));
return Err(std::io::Error::other(working_set.parse_errors.remove(0)));
}

(block, working_set.render())
};

engine_state
.merge_delta(delta)
.map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?;
.map_err(std::io::Error::other)?;
}

// Merge environment into the permanent state
engine_state
.merge_env(&mut stack, home)
.map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?;
.map_err(std::io::Error::other)?;

if engine_state.num_blocks() == 0 {
return Err(std::io::Error::new(
std::io::ErrorKind::Other,
"completer not registered",
));
return Err(std::io::Error::other("completer not registered"));
}
let latest_block_id = engine_state.num_blocks() - 1;

Expand Down Expand Up @@ -265,7 +259,7 @@ fn new_engine(path: &OsStr, home: &Path) -> std::io::Result<(EngineState, Stack)
// Merge environment into the permanent state
engine_state
.merge_env(&mut stack, home)
.map_err(|err| std::io::Error::new(std::io::ErrorKind::Other, err))?;
.map_err(std::io::Error::other)?;

Ok((engine_state, stack))
}
Expand Down
Loading