f41c93b2d3
<!-- 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. --> Clippy fixes for rust 1.76.0-nightly # User-Facing Changes <!-- List of all changes that impact the user experience here. This helps us keep track of breaking changes. --> N/A # 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. -->
91 lines
2.7 KiB
Rust
91 lines
2.7 KiB
Rust
use nu_protocol::{span as span_join, ShellError, Span, Spanned, Value};
|
|
|
|
// Default value used when selecting rows from dataframe
|
|
pub const DEFAULT_ROWS: usize = 5;
|
|
|
|
// Converts a Vec<Value> to a Vec<Spanned<String>> with a Span marking the whole
|
|
// location of the columns for error referencing
|
|
pub(crate) fn convert_columns(
|
|
columns: Vec<Value>,
|
|
span: Span,
|
|
) -> Result<(Vec<Spanned<String>>, Span), ShellError> {
|
|
// First column span
|
|
let mut col_span = columns
|
|
.first()
|
|
.ok_or_else(|| {
|
|
ShellError::GenericError(
|
|
"Empty column list".into(),
|
|
"Empty list found for command".into(),
|
|
Some(span),
|
|
None,
|
|
Vec::new(),
|
|
)
|
|
})
|
|
.map(|v| v.span())?;
|
|
|
|
let res = columns
|
|
.into_iter()
|
|
.map(|value| {
|
|
let span = value.span();
|
|
match value {
|
|
Value::String { val, .. } => {
|
|
col_span = span_join(&[col_span, span]);
|
|
Ok(Spanned { item: val, span })
|
|
}
|
|
_ => Err(ShellError::GenericError(
|
|
"Incorrect column format".into(),
|
|
"Only string as column name".into(),
|
|
Some(span),
|
|
None,
|
|
Vec::new(),
|
|
)),
|
|
}
|
|
})
|
|
.collect::<Result<Vec<Spanned<String>>, _>>()?;
|
|
|
|
Ok((res, col_span))
|
|
}
|
|
|
|
// Converts a Vec<Value> to a Vec<String> with a Span marking the whole
|
|
// location of the columns for error referencing
|
|
pub(crate) fn convert_columns_string(
|
|
columns: Vec<Value>,
|
|
span: Span,
|
|
) -> Result<(Vec<String>, Span), ShellError> {
|
|
// First column span
|
|
let mut col_span = columns
|
|
.first()
|
|
.ok_or_else(|| {
|
|
ShellError::GenericError(
|
|
"Empty column list".into(),
|
|
"Empty list found for command".into(),
|
|
Some(span),
|
|
None,
|
|
Vec::new(),
|
|
)
|
|
})
|
|
.map(|v| v.span())?;
|
|
|
|
let res = columns
|
|
.into_iter()
|
|
.map(|value| {
|
|
let span = value.span();
|
|
match value {
|
|
Value::String { val, .. } => {
|
|
col_span = span_join(&[col_span, span]);
|
|
Ok(val)
|
|
}
|
|
_ => Err(ShellError::GenericError(
|
|
"Incorrect column format".into(),
|
|
"Only string as column name".into(),
|
|
Some(span),
|
|
None,
|
|
Vec::new(),
|
|
)),
|
|
}
|
|
})
|
|
.collect::<Result<Vec<String>, _>>()?;
|
|
|
|
Ok((res, col_span))
|
|
}
|