refactor(linter_codegen): simplify matching "or" patterns (#13576)

overlookmotel · overlookmotel · commit ed77c31c9778 · 2025-09-08T04:42:26.000Z
Follow-on after #13138, as per [this comment](#13138 (comment)). Pure refactor. Break out of loop early on first failure, as following iterations have no effect.
diff --git a/tasks/linter_codegen/src/main.rs b/tasks/linter_codegen/src/main.rs
@@ -269,13 +269,12 @@ fn is_node_kind_call(expr: &Expr) -> bool {
 fn extract_variants_from_pat(pat: &Pat, out: &mut BTreeSet<String>) -> CollectionResult {
     match pat {
         Pat::Or(orpat) => {
-            let mut result = CollectionResult::Complete;
             for p in &orpat.cases {
                 if extract_variants_from_pat(p, out) == CollectionResult::Incomplete {
-                    result = CollectionResult::Incomplete;
+                    return CollectionResult::Incomplete;
                 }
             }
-            result
+            CollectionResult::Complete
         }
         Pat::TupleStruct(ts) => {
             if let Some(variant) = astkind_variant_from_path(&ts.path) {

Original file line number	Diff line number	Diff line change
`@@ -269,13 +269,12 @@ fn is_node_kind_call(expr: &Expr) -> bool {`
`269`	`269`	`fn extract_variants_from_pat(pat: &Pat, out: &mut BTreeSet<String>) -> CollectionResult {`
`270`	`270`	`match pat {`
`271`	`271`	`Pat::Or(orpat) => {`
`272`		`- let mut result = CollectionResult::Complete;`
`273`	`272`	`for p in &orpat.cases {`
`274`	`273`	`if extract_variants_from_pat(p, out) == CollectionResult::Incomplete {`
`275`		`- result = CollectionResult::Incomplete;`
	`274`	`+ return CollectionResult::Incomplete;`
`276`	`275`	`}`
`277`	`276`	`}`
`278`		`- result`
	`277`	`+ CollectionResult::Complete`
`279`	`278`	`}`
`280`	`279`	`Pat::TupleStruct(ts) => {`
`281`	`280`	`if let Some(variant) = astkind_variant_from_path(&ts.path) {`