From a3aff62e4c6387bdced293eb6efdf5625ee9b46c Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@home-assistant.io>
Date: Tue, 10 Mar 2026 13:28:58 -1000
Subject: [PATCH] Use combined namespace esphome::rp2040

---
 esphome/components/rp2040/crash_handler.cpp | 6 ++----
 esphome/components/rp2040/crash_handler.h   | 6 ++----
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/esphome/components/rp2040/crash_handler.cpp b/esphome/components/rp2040/crash_handler.cpp
index 4a38483db6..34268ab6f0 100644
--- a/esphome/components/rp2040/crash_handler.cpp
+++ b/esphome/components/rp2040/crash_handler.cpp
@@ -34,8 +34,7 @@ static inline bool is_code_addr(uint32_t val) {
 
 static constexpr size_t MAX_BACKTRACE = 4;
 
-namespace esphome {
-namespace rp2040 {
+namespace esphome::rp2040 {
 
 static const char *const TAG = "rp2040.crash";
 
@@ -83,8 +82,7 @@ void crash_handler_log() {
   ESP_LOGE(TAG, "Use addr2line -e firmware.elf 0x%08X 0x%08X to decode", s_crash_data.pc, s_crash_data.lr);
 }
 
-}  // namespace rp2040
-}  // namespace esphome
+}  // namespace esphome::rp2040
 
 // --- HardFault handler ---
 // Overrides the weak isr_hardfault from arduino-pico's crt0.S.
diff --git a/esphome/components/rp2040/crash_handler.h b/esphome/components/rp2040/crash_handler.h
index f5b35fa07a..f10db47c23 100644
--- a/esphome/components/rp2040/crash_handler.h
+++ b/esphome/components/rp2040/crash_handler.h
@@ -4,8 +4,7 @@
 
 #include <cstdint>
 
-namespace esphome {
-namespace rp2040 {
+namespace esphome::rp2040 {
 
 /// Read crash data from watchdog scratch registers and clear them.
 void crash_handler_read_and_clear();
@@ -13,7 +12,6 @@ void crash_handler_read_and_clear();
 /// Log crash data if a crash was detected on previous boot.
 void crash_handler_log();
 
-}  // namespace rp2040
-}  // namespace esphome
+}  // namespace esphome::rp2040
 
 #endif  // USE_RP2040