From 53608bece028b4b4b64d6962d38852f21422a800 Mon Sep 17 00:00:00 2001
From: Caleb Cartwright <caleb.cartwright@outlook.com>
Date: Sat, 22 Jun 2024 16:21:14 -0500
Subject: [PATCH] fix bad merge conflict resolution

---
 src/tools/rustfmt/src/parse/macros/lazy_static.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/tools/rustfmt/src/parse/macros/lazy_static.rs b/src/tools/rustfmt/src/parse/macros/lazy_static.rs
index d4f51a4c74df..7baac247e222 100644
--- a/src/tools/rustfmt/src/parse/macros/lazy_static.rs
+++ b/src/tools/rustfmt/src/parse/macros/lazy_static.rs
@@ -26,8 +26,11 @@ pub(crate) fn parse_lazy_static(
                 Err(err) => {
                     err.cancel();
                     parser.psess.dcx().reset_err_count();
+                    return None;
                 }
-
+            }
+        }
+    }
     while parser.token.kind != TokenKind::Eof {
         // Parse a `lazy_static!` item.
         let vis = parse_or!(parse_visibility, rustc_parse::parser::FollowedByType::No);