Fix for_loops_over_fallibles hits in compiletest/src/json.rs

zachs18 · web-flow · commit a59d071e9caa · 2024-05-16T05:51:29.000Z
diff --git a/src/tools/compiletest/src/json.rs b/src/tools/compiletest/src/json.rs
@@ -282,7 +282,7 @@ fn push_expected_errors(
 
     // Add notes for the backtrace
     for span in primary_spans {
-        for frame in &span.expansion {
+        if let Some(frame) = &span.expansion {
             push_backtrace(expected_errors, frame, file_name);
         }
     }
@@ -315,7 +315,7 @@ fn push_backtrace(
         });
     }
 
-    for previous_expansion in &expansion.span.expansion {
+    if let Some(previous_expansion) = &expansion.span.expansion {
         push_backtrace(expected_errors, previous_expansion, file_name);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ fn push_expected_errors(`
`282`	`282`
`283`	`283`	`// Add notes for the backtrace`
`284`	`284`	`for span in primary_spans {`
`285`		`- for frame in &span.expansion {`
	`285`	`+ if let Some(frame) = &span.expansion {`
`286`	`286`	`push_backtrace(expected_errors, frame, file_name);`
`287`	`287`	`}`
`288`	`288`	`}`
`@@ -315,7 +315,7 @@ fn push_backtrace(`
`315`	`315`	`});`
`316`	`316`	`}`
`317`	`317`
`318`		`- for previous_expansion in &expansion.span.expansion {`
	`318`	`+ if let Some(previous_expansion) = &expansion.span.expansion {`
`319`	`319`	`push_backtrace(expected_errors, previous_expansion, file_name);`
`320`	`320`	`}`
`321`	`321`	`}`