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:
nibon7 2023-09-04 15:42:31 +08:00 committed by GitHub
parent e5145358eb
commit 5ad3bfa31b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 16 deletions

View File

@ -53,8 +53,9 @@ impl Command for Match {
} }
let guard_matches = if let Some(guard) = &match_.0.guard { let guard_matches = if let Some(guard) = &match_.0.guard {
let Value::Bool { val, .. } = eval_expression(engine_state, stack, guard)? else { let Value::Bool { val, .. } = eval_expression(engine_state, stack, guard)?
return Err(ShellError::MatchGuardNotBool { span: guard.span}); else {
return Err(ShellError::MatchGuardNotBool { span: guard.span });
}; };
val val

View File

@ -52,7 +52,8 @@ This command is a parser keyword. For details, check:
let Some(Expression { let Some(Expression {
expr: Expr::ImportPattern(import_pattern), expr: Expr::ImportPattern(import_pattern),
.. ..
}) = call.get_parser_info("import_pattern") else { }) = call.get_parser_info("import_pattern")
else {
return Err(ShellError::GenericError( return Err(ShellError::GenericError(
"Unexpected import".into(), "Unexpected import".into(),
"import pattern not supported".into(), "import pattern not supported".into(),

View File

@ -339,17 +339,19 @@ impl Iterator for ParseStreamer {
} }
} }
let Some(v) = self.stream.next() else { return None }; let Some(v) = self.stream.next() else {
return None;
};
let Ok(s) = v.as_string() else { let Ok(s) = v.as_string() else {
return Some(Value::error ( return Some(Value::error(
ShellError::PipelineMismatch { ShellError::PipelineMismatch {
exp_input_type: "string".into(), exp_input_type: "string".into(),
dst_span: self.span, dst_span: self.span,
src_span: v.span(), src_span: v.span(),
}, },
v.span(), v.span(),
)) ));
}; };
let parsed = stream_helper( let parsed = stream_helper(
@ -412,8 +414,8 @@ impl Iterator for ParseStreamerExternal {
dst_span: self.span, dst_span: self.span,
src_span: self.span, src_span: self.span,
}, },
self.span, self.span,
)) ));
}; };
stream_helper( stream_helper(

View File

@ -3510,7 +3510,7 @@ pub fn parse_register(working_set: &mut StateWorkingSet, spans: &[Span]) -> Pipe
value_as_string(val, expr.span).map_err(|err| err.wrap(working_set, call.head))?; value_as_string(val, expr.span).map_err(|err| err.wrap(working_set, call.head))?;
let Some(path) = find_in_dirs(&filename, working_set, &cwd, PLUGIN_DIRS_VAR) else { let Some(path) = find_in_dirs(&filename, working_set, &cwd, PLUGIN_DIRS_VAR) else {
return Err(ParseError::RegisteredFileNotFound(filename, expr.span)) return Err(ParseError::RegisteredFileNotFound(filename, expr.span));
}; };
if path.exists() && path.is_file() { if path.exists() && path.is_file() {

View File

@ -2822,7 +2822,7 @@ fn parse_collection_shape(
while idx < tokens.len() { while idx < tokens.len() {
let TokenContents::Item = tokens[idx].contents else { let TokenContents::Item = tokens[idx].contents else {
working_set.error(key_error(tokens[idx].span)); 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(); let key_bytes = working_set.get_span_contents(tokens[idx].span).to_vec();
@ -2831,7 +2831,9 @@ fn parse_collection_shape(
continue; 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)); working_set.error(key_error(tokens[idx].span));
return mk_shape(vec![]); return mk_shape(vec![]);
}; };
@ -4026,7 +4028,11 @@ fn parse_table_expression(working_set: &mut StateWorkingSet, span: Span) -> Expr
} }
let head = { 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") 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), expr: Expr::List(item),
span, span,
.. ..
} = ls else { } = ls
else {
unreachable!("the item must be a list") unreachable!("the item must be a list")
}; };

View File

@ -210,9 +210,10 @@ impl Iterator for RangeIterator {
self.curr.partial_cmp(&self.end) self.curr.partial_cmp(&self.end)
}; };
let Some(ordering) = ordering else { let Some(ordering) = ordering else {
self.done = true; self.done = true;
return Some(Value::error(ShellError::CannotCreateRange { span: self.span }, return Some(Value::error(
ShellError::CannotCreateRange { span: self.span },
self.span, self.span,
)); ));
}; };