mirror of
https://github.com/nushell/nushell.git
synced 2025-07-08 10:27:47 +02:00
Auto format let-else block (#10214)
<!-- 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. --> rustfmt 1.6.0 has added support for formatting [let-else statements](https://doc.rust-lang.org/rust-by-example/flow_control/let_else.html) See https://github.com/rust-lang/rustfmt/blob/master/CHANGELOG.md#added # 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:
@ -2822,7 +2822,7 @@ fn parse_collection_shape(
|
||||
while idx < tokens.len() {
|
||||
let TokenContents::Item = tokens[idx].contents else {
|
||||
working_set.error(key_error(tokens[idx].span));
|
||||
return mk_shape(vec![])
|
||||
return mk_shape(vec![]);
|
||||
};
|
||||
|
||||
let key_bytes = working_set.get_span_contents(tokens[idx].span).to_vec();
|
||||
@ -2831,7 +2831,9 @@ fn parse_collection_shape(
|
||||
continue;
|
||||
}
|
||||
|
||||
let Some(key) = parse_value(working_set, tokens[idx].span, &SyntaxShape::String).as_string() else {
|
||||
let Some(key) =
|
||||
parse_value(working_set, tokens[idx].span, &SyntaxShape::String).as_string()
|
||||
else {
|
||||
working_set.error(key_error(tokens[idx].span));
|
||||
return mk_shape(vec![]);
|
||||
};
|
||||
@ -4026,7 +4028,11 @@ fn parse_table_expression(working_set: &mut StateWorkingSet, span: Span) -> Expr
|
||||
}
|
||||
|
||||
let head = {
|
||||
let Expression { expr: Expr::List(vals), .. } = head else {
|
||||
let Expression {
|
||||
expr: Expr::List(vals),
|
||||
..
|
||||
} = head
|
||||
else {
|
||||
unreachable!("head must be a list by now")
|
||||
};
|
||||
|
||||
@ -4058,7 +4064,8 @@ fn parse_table_expression(working_set: &mut StateWorkingSet, span: Span) -> Expr
|
||||
expr: Expr::List(item),
|
||||
span,
|
||||
..
|
||||
} = ls else {
|
||||
} = ls
|
||||
else {
|
||||
unreachable!("the item must be a list")
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user