From 228273f218e40163bf65e32cdbfca37be775549b Mon Sep 17 00:00:00 2001
From: danakj <danakj@orodu.net>
Date: Mon, 9 Dec 2024 15:14:09 -0500
Subject: [PATCH] write-newline

---
 toolchain/check/dump_id.cpp | 2 +-
 toolchain/check/dump_id.h   | 5 +++--
 toolchain/lex/dump_id.cpp   | 2 +-
 toolchain/lex/dump_id.h     | 5 +++--
 toolchain/parse/dump_id.cpp | 2 +-
 toolchain/parse/dump_id.h   | 5 +++--
 6 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/toolchain/check/dump_id.cpp b/toolchain/check/dump_id.cpp
index caf1017448d7e..ad54cabf4ea90 100644
--- a/toolchain/check/dump_id.cpp
+++ b/toolchain/check/dump_id.cpp
@@ -43,7 +43,7 @@ auto DumpIdImpl(SemIR::LocId loc_id, const Context& context) -> void {
 }
 
 template <>
-auto DumpIdMethods<Context>::Newline() const -> void {
+auto DumpIdMethods<Context>::WriteNewline() const -> void {
   llvm::errs() << "\n";
 }
 
diff --git a/toolchain/check/dump_id.h b/toolchain/check/dump_id.h
index 240cc408e8e80..0606fe49b8959 100644
--- a/toolchain/check/dump_id.h
+++ b/toolchain/check/dump_id.h
@@ -36,11 +36,12 @@ class DumpIdMethods {
   }
   LLVM_DUMP_METHOD auto DumpId(SemIR::LocId loc_id) const -> void {
     DumpIdImpl(loc_id, static_cast<const Context&>(*this));
-    Newline();
+    WriteNewline();
   }
 
  private:
-  auto Newline() const -> void;
+  // Helper to keep stream includes out of the header file.
+  auto WriteNewline() const -> void;
 };
 
 }  // namespace Carbon::Check
diff --git a/toolchain/lex/dump_id.cpp b/toolchain/lex/dump_id.cpp
index b835291868e7f..9d490e578b8fd 100644
--- a/toolchain/lex/dump_id.cpp
+++ b/toolchain/lex/dump_id.cpp
@@ -27,7 +27,7 @@ auto DumpIdImpl(TokenIndex token, const TokenizedBuffer& buffer) -> void {
 }
 
 template <>
-auto DumpIdMethods<TokenizedBuffer>::Newline() const -> void {
+auto DumpIdMethods<TokenizedBuffer>::WriteNewline() const -> void {
   llvm::errs() << "\n";
 }
 
diff --git a/toolchain/lex/dump_id.h b/toolchain/lex/dump_id.h
index 5d56c1b719eb0..04d72b9295bc7 100644
--- a/toolchain/lex/dump_id.h
+++ b/toolchain/lex/dump_id.h
@@ -28,11 +28,12 @@ class DumpIdMethods {
  public:
   LLVM_DUMP_METHOD auto DumpId(TokenIndex token) const -> void {
     DumpIdImpl(token, static_cast<const TokenizedBuffer&>(*this));
-    Newline();
+    WriteNewline();
   }
 
  private:
-  auto Newline() const -> void;
+  // Helper to keep stream includes out of the header file.
+  auto WriteNewline() const -> void;
 };
 
 }  // namespace Carbon::Lex
diff --git a/toolchain/parse/dump_id.cpp b/toolchain/parse/dump_id.cpp
index 1c8e2365456b5..9a6fd4b534cd7 100644
--- a/toolchain/parse/dump_id.cpp
+++ b/toolchain/parse/dump_id.cpp
@@ -27,7 +27,7 @@ auto DumpIdImpl(NodeId node_id, const Tree& tree) -> void {
 }
 
 template <>
-auto DumpIdMethods<Tree>::Newline() const -> void {
+auto DumpIdMethods<Tree>::WriteNewline() const -> void {
   llvm::errs() << "\n";
 }
 
diff --git a/toolchain/parse/dump_id.h b/toolchain/parse/dump_id.h
index bc7f80dda8e77..624a1469ab3b8 100644
--- a/toolchain/parse/dump_id.h
+++ b/toolchain/parse/dump_id.h
@@ -31,11 +31,12 @@ class DumpIdMethods {
   }
   LLVM_DUMP_METHOD auto DumpId(NodeId node_id) const -> void {
     DumpIdImpl(node_id, static_cast<const Tree&>(*this));
-    Newline();
+    WriteNewline();
   }
 
  private:
-  auto Newline() const -> void;
+  // Helper to keep stream includes out of the header file.
+  auto WriteNewline() const -> void;
 };
 
 }  // namespace Carbon::Parse