Contentious clippy fixes (#13498)

Lints from stable or nightly toolchain that may have questionable added
value.

- **Contentious lint to contract into single `if let`**
- **Potential false positive around `AsRef`/`Deref` fun**
This commit is contained in:
Stefan Holderbach 2024-08-01 11:02:55 +02:00 committed by GitHub
parent ae5fed41ed
commit 2c6b1471e1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 16 additions and 16 deletions

View File

@ -235,7 +235,7 @@ impl Command for UCp {
for (sources, need_expand_tilde) in sources.iter_mut() { for (sources, need_expand_tilde) in sources.iter_mut() {
for src in sources.iter_mut() { for src in sources.iter_mut() {
if !src.is_absolute() { if !src.is_absolute() {
*src = nu_path::expand_path_with(&src, &cwd, *need_expand_tilde); *src = nu_path::expand_path_with(&*src, &cwd, *need_expand_tilde);
} }
} }
} }

View File

@ -156,7 +156,7 @@ impl Command for UMv {
for (files, need_expand_tilde) in files.iter_mut() { for (files, need_expand_tilde) in files.iter_mut() {
for src in files.iter_mut() { for src in files.iter_mut() {
if !src.is_absolute() { if !src.is_absolute() {
*src = nu_path::expand_path_with(&src, &cwd, *need_expand_tilde); *src = nu_path::expand_path_with(&*src, &cwd, *need_expand_tilde);
} }
} }
} }

View File

@ -300,21 +300,21 @@ pub fn parse_for(working_set: &mut StateWorkingSet, lite_command: &LiteCommand)
} }
// Let's get our block and make sure it has the right signature // Let's get our block and make sure it has the right signature
if let Some(arg) = call.positional_nth(2) { if let Some(
match arg { Expression {
Expression { expr: Expr::Block(block_id),
expr: Expr::Block(block_id), ..
.. }
} | Expression {
| Expression { expr: Expr::RowCondition(block_id),
expr: Expr::RowCondition(block_id), ..
.. },
} => { ) = call.positional_nth(2)
let block = working_set.get_block_mut(*block_id); {
{
let block = working_set.get_block_mut(*block_id);
block.signature = Box::new(sig); block.signature = Box::new(sig);
}
_ => {}
} }
} }