Skip to content

fix(rust): collapse match guard to fix clippy::collapsible_match CI failure #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
w-martin merged 4 commits into from
May 26, 2026
Merged

fix(rust): collapse match guard to fix clippy::collapsible_match CI failure #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9f987a3
fix(rust): collapse nested if into match guard to satisfy clippy::col…
w-martin May 16, 2026
1da32aa
style(rust): merge split if-let conditions to satisfy cargo fmt check
w-martin May 24, 2026
4a8893a
style(rust): run cargo fmt to fix all formatting issues
w-martin May 26, 2026
ba24dd6
chore(dev): add cargo fmt and cargo clippy to pre-commit hooks
w-martin May 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,18 @@ repos:
- id: ruff-check
args: [--fix]
- id: ruff-format

- repo: local
hooks:
- id: cargo-fmt
name: Rust format check
entry: bash -c 'cd rust && cargo fmt --all -- --check'
language: system
files: \.rs$
pass_filenames: false
- id: cargo-clippy
name: Rust clippy
entry: bash -c 'cd rust && cargo clippy -- -D warnings'
language: system
files: \.rs$
pass_filenames: false
69 changes: 33 additions & 36 deletions rust/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1919,47 +1919,44 @@ impl Linter {
);
}
}
Expr::Name(name) => {
if name.id.as_str() == "concat" {
if !call.arguments.args.is_empty() {
if let Expr::List(list) = &call.arguments.args[0] {
let mut schemas = Vec::new();
for el in &list.elts {
if let Expr::Name(n) = el {
if let Some((s, _)) =
self.variables.get(n.id.as_str())
{
schemas.push(s.clone());
}
Expr::Name(name) if name.id.as_str() == "concat" => {
if !call.arguments.args.is_empty() {
if let Expr::List(list) = &call.arguments.args[0] {
let mut schemas = Vec::new();
for el in &list.elts {
if let Expr::Name(n) = el {
if let Some((s, _)) = self.variables.get(n.id.as_str())
{
schemas.push(s.clone());
}
}
if schemas.len() >= 2 {
is_merge_or_concat = true;
merge_schema =
Some((schemas[0].clone(), schemas[1].clone()));
}
}
} else if let Some(keyword) =
call.arguments.keywords.iter().find(|k| {
k.arg.as_ref().map(|s| s.as_str()) == Some("objs")
})
{
if let Expr::List(list) = &keyword.value {
let mut schemas = Vec::new();
for el in &list.elts {
if let Expr::Name(n) = el {
if let Some((s, _)) =
self.variables.get(n.id.as_str())
{
schemas.push(s.clone());
}
if schemas.len() >= 2 {
is_merge_or_concat = true;
merge_schema =
Some((schemas[0].clone(), schemas[1].clone()));
}
}
} else if let Some(keyword) = call
.arguments
.keywords
.iter()
.find(|k| k.arg.as_ref().map(|s| s.as_str()) == Some("objs"))
{
if let Expr::List(list) = &keyword.value {
let mut schemas = Vec::new();
for el in &list.elts {
if let Expr::Name(n) = el {
if let Some((s, _)) = self.variables.get(n.id.as_str())
{
schemas.push(s.clone());
}
}
if schemas.len() >= 2 {
is_merge_or_concat = true;
merge_schema =
Some((schemas[0].clone(), schemas[1].clone()));
}
}
if schemas.len() >= 2 {
is_merge_or_concat = true;
merge_schema =
Some((schemas[0].clone(), schemas[1].clone()));
}
}
}
Expand Down
Loading