Skip to content

Fix clippy::collapsible_match lints #300

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
jgardn3r merged 1 commit into from
May 21, 2026
Merged

Fix clippy::collapsible_match lints #300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 25 additions & 30 deletions core/src/rules/optimising_line_formatter/contexts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -679,12 +679,13 @@ impl<'a> SpecificContextStack<'a> {
{
if let Some(data) = Rc::make_mut(&mut node.context_data).get_mut(ctx_index) {
match ctx.context_type {
CT::ConditionalDirective => {
if curr_token_type.is_some_and(|t| !t.is_comment_or_compiler_directive()) {
data.can_break &= data.is_child_broken | is_break;
data.one_element_per_line
.get_or_insert(data.is_child_broken | is_break);
}
CT::ConditionalDirective
if curr_token_type
.is_some_and(|t| !t.is_comment_or_compiler_directive()) =>
{
data.can_break &= data.is_child_broken | is_break;
data.one_element_per_line
.get_or_insert(data.is_child_broken | is_break);
}
CT::TypedAssignment | CT::ForLoop | CT::RaiseAt => {
data.is_broken |= data.is_child_broken
Expand All @@ -700,15 +701,11 @@ impl<'a> SpecificContextStack<'a> {
data.one_element_per_line = Some(true);
}
}
CT::MemberAccess => {
if is_break {
data.one_element_per_line = Some(true);
}
CT::MemberAccess if is_break => {
data.one_element_per_line = Some(true);
}
CT::CommaElem | CT::AssignRHS => {
if is_break {
data.break_anonymous_routine = Some(true);
}
CT::CommaElem | CT::AssignRHS if is_break => {
data.break_anonymous_routine = Some(true);
}
_ => {}
}
Expand Down Expand Up @@ -1095,22 +1092,20 @@ impl<'a> LineFormattingContexts<'a> {
contexts.last_context_mut().context_type = CT::RaiseAt;
contexts.push(CT::Subject);
}
TT::Op(OK::Dot) => {
if CT::Precedence(0) == last_context_type {
contexts.retain_current();
if matches!(prev_token_type, Some(TT::Op(OK::RParen | OK::RBrack))) {
/*
Fluency is considered after () and [] because
they allow for arbitrary computation which will
harm the readability of a chained expression on
a single line.

<> and just pure names are more likely to be
simple. Generics are seen as an extension of the
identifier.
*/
contexts.fluent(contexts.current_context.clone());
}
TT::Op(OK::Dot) if CT::Precedence(0) == last_context_type => {
Comment thread
fourls marked this conversation as resolved.
contexts.retain_current();
if matches!(prev_token_type, Some(TT::Op(OK::RParen | OK::RBrack))) {
/*
Fluency is considered after () and [] because
they allow for arbitrary computation which will
harm the readability of a chained expression on
a single line.

<> and just pure names are more likely to be
simple. Generics are seen as an extension of the
identifier.
*/
contexts.fluent(contexts.current_context.clone());
}
}
op if super::get_operator_precedence(op).is_some()
Expand Down
Loading