mirror of
https://github.com/nushell/nushell.git
synced 2025-05-02 00:54:25 +02:00
fix: items doesn't support lazy records (#11567)
<!-- if this PR closes one or more issues, you can automatically link the PR with them by using one of the [*linking keywords*](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword), e.g. - this PR should close #xxxx - fixes #xxxx you can also mention related issues, PRs or discussions! --> # Description <!-- Thank you for improving Nushell. Please, check our [contributing guide](../CONTRIBUTING.md) and talk to the core team before making major changes. Description of your pull request goes here. **Provide examples and/or screenshots** if your changes affect the user experience. --> Implement support for lazy records for `items`, the same way `columns` or `values` do. # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> Something like `sys | items {|k,v| $"($k): ($v)"}` used to fail with an error. Now it works as expected. # 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. -->
This commit is contained in:
parent
55bf4d847f
commit
19e76332fa
@ -92,24 +92,39 @@ impl Command for Items {
|
|||||||
};
|
};
|
||||||
match input {
|
match input {
|
||||||
PipelineData::Empty => Ok(PipelineData::Empty),
|
PipelineData::Empty => Ok(PipelineData::Empty),
|
||||||
PipelineData::Value(Value::Record { val, .. }, ..) => Ok(val
|
PipelineData::Value(v, ..) => match v {
|
||||||
|
Value::Record { val, .. } => Ok(val
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map_while(run_for_each_item)
|
.map_while(run_for_each_item)
|
||||||
.into_pipeline_data(ctrlc)),
|
.into_pipeline_data(ctrlc)),
|
||||||
// Errors
|
Value::LazyRecord { val, .. } => {
|
||||||
|
let record = match val.collect()? {
|
||||||
|
Value::Record { val, .. } => val,
|
||||||
|
_ => Err(ShellError::NushellFailedSpanned {
|
||||||
|
msg: "`LazyRecord::collect()` promises `Value::Record`".into(),
|
||||||
|
label: "Violating lazy record found here".into(),
|
||||||
|
span,
|
||||||
|
})?,
|
||||||
|
};
|
||||||
|
Ok(record
|
||||||
|
.into_iter()
|
||||||
|
.map_while(run_for_each_item)
|
||||||
|
.into_pipeline_data(ctrlc))
|
||||||
|
}
|
||||||
|
Value::Error { error, .. } => Err(*error),
|
||||||
|
other => Err(ShellError::OnlySupportsThisInputType {
|
||||||
|
exp_input_type: "record".into(),
|
||||||
|
wrong_type: other.get_type().to_string(),
|
||||||
|
dst_span: call.head,
|
||||||
|
src_span: other.span(),
|
||||||
|
}),
|
||||||
|
},
|
||||||
PipelineData::ListStream(..) => Err(ShellError::OnlySupportsThisInputType {
|
PipelineData::ListStream(..) => Err(ShellError::OnlySupportsThisInputType {
|
||||||
exp_input_type: "record".into(),
|
exp_input_type: "record".into(),
|
||||||
wrong_type: "stream".into(),
|
wrong_type: "stream".into(),
|
||||||
dst_span: call.head,
|
dst_span: call.head,
|
||||||
src_span: input_span,
|
src_span: input_span,
|
||||||
}),
|
}),
|
||||||
PipelineData::Value(Value::Error { error, .. }, ..) => Err(*error),
|
|
||||||
PipelineData::Value(other, ..) => Err(ShellError::OnlySupportsThisInputType {
|
|
||||||
exp_input_type: "record".into(),
|
|
||||||
wrong_type: other.get_type().to_string(),
|
|
||||||
dst_span: call.head,
|
|
||||||
src_span: other.span(),
|
|
||||||
}),
|
|
||||||
PipelineData::ExternalStream { .. } => Err(ShellError::OnlySupportsThisInputType {
|
PipelineData::ExternalStream { .. } => Err(ShellError::OnlySupportsThisInputType {
|
||||||
exp_input_type: "record".into(),
|
exp_input_type: "record".into(),
|
||||||
wrong_type: "raw data".into(),
|
wrong_type: "raw data".into(),
|
||||||
|
Loading…
Reference in New Issue
Block a user