mirror of
https://github.com/nushell/nushell.git
synced 2025-08-10 03:48:04 +02:00
Move Value to helpers, separate span call (#10121)
# Description As part of the refactor to split spans off of Value, this moves to using helper functions to create values, and using `.span()` instead of matching span out of Value directly. Hoping to get a few more helping hands to finish this, as there are a lot of commands to update :) # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> # Tests + Formatting <!-- Don't forget to add tests that cover your changes. Make sure you've run and fixed any issues with these commands: - `cargo fmt --all -- --check` to check standard code formatting (`cargo fmt --all` applies these changes) - `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used` to check that you're using the standard code style - `cargo test --workspace` to check that all tests pass (on Windows make sure to [enable developer mode](https://learn.microsoft.com/en-us/windows/apps/get-started/developer-mode-features-and-debugging)) - `cargo run -- -c "use std testing; testing run-tests --path crates/nu-std"` to run the tests for the standard library > **Note** > from `nushell` you can also use the `toolkit` as follows > ```bash > use toolkit.nu # or use an `env_change` hook to activate it automatically > toolkit check pr > ``` --> # After Submitting <!-- If your PR had any user-facing changes, update [the documentation](https://github.com/nushell/nushell.github.io) after the PR is merged, if necessary. This will help us keep the docs up to date. --> --------- Co-authored-by: Darren Schroeder <343840+fdncred@users.noreply.github.com> Co-authored-by: WindSoilder <windsoilder@outlook.com>
This commit is contained in:
@ -60,15 +60,9 @@ impl Command for Complete {
|
||||
.spawn(move || {
|
||||
let stderr = stderr.into_bytes()?;
|
||||
if let Ok(st) = String::from_utf8(stderr.item.clone()) {
|
||||
Ok::<_, ShellError>(Value::String {
|
||||
val: st,
|
||||
span: stderr.span,
|
||||
})
|
||||
Ok::<_, ShellError>(Value::string(st, stderr.span))
|
||||
} else {
|
||||
Ok::<_, ShellError>(Value::Binary {
|
||||
val: stderr.item,
|
||||
span: stderr.span,
|
||||
})
|
||||
Ok::<_, ShellError>(Value::binary(stderr.item, stderr.span))
|
||||
}
|
||||
})
|
||||
.expect("failed to create thread"),
|
||||
|
@ -60,8 +60,9 @@ impl Command for NuCheck {
|
||||
None, vec![]));
|
||||
}
|
||||
|
||||
let span = input.span().unwrap_or(call.head);
|
||||
match input {
|
||||
PipelineData::Value(Value::String { val, span }, ..) => {
|
||||
PipelineData::Value(Value::String { val, .. }, ..) => {
|
||||
let contents = Vec::from(val);
|
||||
if is_all {
|
||||
heuristic_parse(&mut working_set, None, &contents, is_debug, call.head)
|
||||
|
@ -506,10 +506,10 @@ impl ExternalCommand {
|
||||
"{cause}: oops, process '{commandname}' core dumped"
|
||||
))
|
||||
);
|
||||
let _ = exit_code_tx.send(Value::Error {
|
||||
error: Box::new(ShellError::ExternalCommand { label: "core dumped".to_string(), help: format!("{cause}: child process '{commandname}' core dumped"), span: head }),
|
||||
span: head,
|
||||
});
|
||||
let _ = exit_code_tx.send(Value::error (
|
||||
ShellError::ExternalCommand { label: "core dumped".to_string(), help: format!("{cause}: child process '{commandname}' core dumped"), span: head },
|
||||
head,
|
||||
));
|
||||
return Ok(());
|
||||
}
|
||||
}
|
||||
|
@ -38,10 +38,7 @@ impl Command for Sys {
|
||||
_input: PipelineData,
|
||||
) -> Result<PipelineData, ShellError> {
|
||||
let span = call.span();
|
||||
let ret = Value::LazyRecord {
|
||||
val: Box::new(SysResult { span }),
|
||||
span,
|
||||
};
|
||||
let ret = Value::lazy_record(Box::new(SysResult { span }), span);
|
||||
|
||||
Ok(ret.into_pipeline_data())
|
||||
}
|
||||
@ -100,10 +97,7 @@ impl LazyRecord<'_> for SysResult {
|
||||
}
|
||||
|
||||
fn clone_value(&self, span: Span) -> Value {
|
||||
Value::LazyRecord {
|
||||
val: Box::new((*self).clone()),
|
||||
span,
|
||||
}
|
||||
Value::lazy_record(Box::new((*self).clone()), span)
|
||||
}
|
||||
}
|
||||
|
||||
@ -133,7 +127,7 @@ pub fn disks(span: Span) -> Value {
|
||||
|
||||
output.push(Value::record(record, span));
|
||||
}
|
||||
Value::List { vals: output, span }
|
||||
Value::list(output, span)
|
||||
}
|
||||
|
||||
pub fn net(span: Span) -> Value {
|
||||
@ -151,7 +145,7 @@ pub fn net(span: Span) -> Value {
|
||||
|
||||
output.push(Value::record(record, span));
|
||||
}
|
||||
Value::List { vals: output, span }
|
||||
Value::list(output, span)
|
||||
}
|
||||
|
||||
pub fn cpu(span: Span) -> Value {
|
||||
@ -187,7 +181,7 @@ pub fn cpu(span: Span) -> Value {
|
||||
output.push(Value::record(record, span));
|
||||
}
|
||||
|
||||
Value::List { vals: output, span }
|
||||
Value::list(output, span)
|
||||
}
|
||||
|
||||
pub fn mem(span: Span) -> Value {
|
||||
@ -264,10 +258,7 @@ pub fn host(span: Span) -> Value {
|
||||
for user in sys.users() {
|
||||
let mut groups = vec![];
|
||||
for group in user.groups() {
|
||||
groups.push(Value::String {
|
||||
val: trim_cstyle_null(group.to_string()),
|
||||
span,
|
||||
});
|
||||
groups.push(Value::string(trim_cstyle_null(group.to_string()), span));
|
||||
}
|
||||
|
||||
let record = record! {
|
||||
@ -305,5 +296,5 @@ pub fn temp(span: Span) -> Value {
|
||||
output.push(Value::record(record, span));
|
||||
}
|
||||
|
||||
Value::List { vals: output, span }
|
||||
Value::list(output, span)
|
||||
}
|
||||
|
Reference in New Issue
Block a user