optimize/clean up a few of the table changes (#11076)

# Description

@sholderbach pointed out some places that I could help improve the code
in the table command changes. This PR tries to implement those.

# 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.
-->
This commit is contained in:
Darren Schroeder 2023-11-16 11:37:46 -06:00 committed by GitHub
parent 461837773b
commit 80bee40807
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 18 deletions

View File

@ -321,21 +321,16 @@ fn get_theme_flag(
state: &EngineState, state: &EngineState,
stack: &mut Stack, stack: &mut Stack,
) -> Result<Option<TableMode>, ShellError> { ) -> Result<Option<TableMode>, ShellError> {
let theme_name = call.get_flag(state, stack, "theme")?; call.get_flag(state, stack, "theme")?
theme_name .map(|theme: String| {
.clone() TableMode::from_str(&theme).map_err(|err| ShellError::CantConvert {
.map(|theme: String| TableMode::from_str(&theme))
.transpose()
.map_err(|err| ShellError::CantConvert {
to_type: String::from("theme"), to_type: String::from("theme"),
from_type: String::from("string"), from_type: String::from("string"),
span: call.span(), span: call.span(),
help: Some(format!( help: Some(format!("{}, but found '{}'.", err, theme)),
"{}, but found '{}'.",
String::from(err),
theme_name.unwrap_or("".to_string())
)),
}) })
})
.transpose()
} }
struct CmdInput<'a> { struct CmdInput<'a> {

View File

@ -11,7 +11,6 @@ pub enum TableMode {
Compact, Compact,
WithLove, WithLove,
CompactDouble, CompactDouble,
Default,
#[default] #[default]
Rounded, Rounded,
Reinforced, Reinforced,
@ -36,7 +35,7 @@ impl FromStr for TableMode {
"compact" => Ok(Self::Compact), "compact" => Ok(Self::Compact),
"with_love" => Ok(Self::WithLove), "with_love" => Ok(Self::WithLove),
"compact_double" => Ok(Self::CompactDouble), "compact_double" => Ok(Self::CompactDouble),
"default" => Ok(Self::Rounded), "default" => Ok(TableMode::default()),
"rounded" => Ok(Self::Rounded), "rounded" => Ok(Self::Rounded),
"reinforced" => Ok(Self::Reinforced), "reinforced" => Ok(Self::Reinforced),
"heavy" => Ok(Self::Heavy), "heavy" => Ok(Self::Heavy),
@ -62,7 +61,6 @@ impl ReconstructVal for TableMode {
TableMode::Compact => "compact", TableMode::Compact => "compact",
TableMode::WithLove => "with_love", TableMode::WithLove => "with_love",
TableMode::CompactDouble => "compact_double", TableMode::CompactDouble => "compact_double",
TableMode::Default => "rounded",
TableMode::Rounded => "rounded", TableMode::Rounded => "rounded",
TableMode::Reinforced => "reinforced", TableMode::Reinforced => "reinforced",
TableMode::Heavy => "heavy", TableMode::Heavy => "heavy",

View File

@ -182,7 +182,6 @@ pub fn load_theme(mode: TableMode) -> TableTheme {
TableMode::Compact => TableTheme::compact(), TableMode::Compact => TableTheme::compact(),
TableMode::WithLove => TableTheme::with_love(), TableMode::WithLove => TableTheme::with_love(),
TableMode::CompactDouble => TableTheme::compact_double(), TableMode::CompactDouble => TableTheme::compact_double(),
TableMode::Default => TableTheme::rounded(),
TableMode::Rounded => TableTheme::rounded(), TableMode::Rounded => TableTheme::rounded(),
TableMode::Reinforced => TableTheme::reinforced(), TableMode::Reinforced => TableTheme::reinforced(),
TableMode::Heavy => TableTheme::heavy(), TableMode::Heavy => TableTheme::heavy(),