From 08035261b85617b6b978336c8ca56629a86bb5cc Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Thu, 26 Feb 2026 13:02:36 -0700
Subject: [PATCH] [libretiny] Use C++17 nested namespace syntax (#14325)

---
 esphome/components/libretiny/core.h           | 4 +---
 esphome/components/libretiny/gpio_arduino.cpp | 7 ++++---
 esphome/components/libretiny/gpio_arduino.h   | 6 ++----
 esphome/components/libretiny/lt_component.cpp | 6 ++----
 esphome/components/libretiny/lt_component.h   | 6 ++----
 esphome/components/libretiny/preferences.cpp  | 7 ++++---
 esphome/components/libretiny/preferences.h    | 6 ++----
 7 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/esphome/components/libretiny/core.h b/esphome/components/libretiny/core.h
index 9458df1f16..f909db4f0f 100644
--- a/esphome/components/libretiny/core.h
+++ b/esphome/components/libretiny/core.h
@@ -4,8 +4,6 @@
 
 #include <Arduino.h>
 
-namespace esphome {
-namespace libretiny {}  // namespace libretiny
-}  // namespace esphome
+namespace esphome::libretiny {}  // namespace esphome::libretiny
 
 #endif  // USE_LIBRETINY
diff --git a/esphome/components/libretiny/gpio_arduino.cpp b/esphome/components/libretiny/gpio_arduino.cpp
index 0b14c77cf2..1af0dce16d 100644
--- a/esphome/components/libretiny/gpio_arduino.cpp
+++ b/esphome/components/libretiny/gpio_arduino.cpp
@@ -3,8 +3,7 @@
 #include "gpio_arduino.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace libretiny {
+namespace esphome::libretiny {
 
 static const char *const TAG = "lt.gpio";
 
@@ -77,7 +76,9 @@ void ArduinoInternalGPIOPin::detach_interrupt() const {
   detachInterrupt(pin_);  // NOLINT
 }
 
-}  // namespace libretiny
+}  // namespace esphome::libretiny
+
+namespace esphome {
 
 using namespace libretiny;
 
diff --git a/esphome/components/libretiny/gpio_arduino.h b/esphome/components/libretiny/gpio_arduino.h
index 30c7c33869..5f1fa3fec7 100644
--- a/esphome/components/libretiny/gpio_arduino.h
+++ b/esphome/components/libretiny/gpio_arduino.h
@@ -3,8 +3,7 @@
 #ifdef USE_LIBRETINY
 #include "esphome/core/hal.h"
 
-namespace esphome {
-namespace libretiny {
+namespace esphome::libretiny {
 
 class ArduinoInternalGPIOPin : public InternalGPIOPin {
  public:
@@ -31,7 +30,6 @@ class ArduinoInternalGPIOPin : public InternalGPIOPin {
   gpio::Flags flags_{};
 };
 
-}  // namespace libretiny
-}  // namespace esphome
+}  // namespace esphome::libretiny
 
 #endif  // USE_LIBRETINY
diff --git a/esphome/components/libretiny/lt_component.cpp b/esphome/components/libretiny/lt_component.cpp
index 834245c147..c01661b3a6 100644
--- a/esphome/components/libretiny/lt_component.cpp
+++ b/esphome/components/libretiny/lt_component.cpp
@@ -4,8 +4,7 @@
 
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace libretiny {
+namespace esphome::libretiny {
 
 static const char *const TAG = "lt.component";
 
@@ -28,7 +27,6 @@ void LTComponent::dump_config() {
 
 float LTComponent::get_setup_priority() const { return setup_priority::LATE; }
 
-}  // namespace libretiny
-}  // namespace esphome
+}  // namespace esphome::libretiny
 
 #endif  // USE_LIBRETINY
diff --git a/esphome/components/libretiny/lt_component.h b/esphome/components/libretiny/lt_component.h
index 3d4483ab5d..896f1901e3 100644
--- a/esphome/components/libretiny/lt_component.h
+++ b/esphome/components/libretiny/lt_component.h
@@ -12,8 +12,7 @@
 #include "esphome/components/text_sensor/text_sensor.h"
 #endif
 
-namespace esphome {
-namespace libretiny {
+namespace esphome::libretiny {
 
 class LTComponent : public Component {
  public:
@@ -30,7 +29,6 @@ class LTComponent : public Component {
 #endif  // USE_TEXT_SENSOR
 };
 
-}  // namespace libretiny
-}  // namespace esphome
+}  // namespace esphome::libretiny
 
 #endif  // USE_LIBRETINY
diff --git a/esphome/components/libretiny/preferences.cpp b/esphome/components/libretiny/preferences.cpp
index 8549631e46..740c1a233a 100644
--- a/esphome/components/libretiny/preferences.cpp
+++ b/esphome/components/libretiny/preferences.cpp
@@ -8,8 +8,7 @@
 #include <cstring>
 #include <memory>
 
-namespace esphome {
-namespace libretiny {
+namespace esphome::libretiny {
 
 static const char *const TAG = "lt.preferences";
 
@@ -194,7 +193,9 @@ void setup_preferences() {
   global_preferences = &s_preferences;
 }
 
-}  // namespace libretiny
+}  // namespace esphome::libretiny
+
+namespace esphome {
 
 ESPPreferences *global_preferences;  // NOLINT(cppcoreguidelines-avoid-non-const-global-variables)
 
diff --git a/esphome/components/libretiny/preferences.h b/esphome/components/libretiny/preferences.h
index 8ec3cd31b1..68f377bd3e 100644
--- a/esphome/components/libretiny/preferences.h
+++ b/esphome/components/libretiny/preferences.h
@@ -2,12 +2,10 @@
 
 #ifdef USE_LIBRETINY
 
-namespace esphome {
-namespace libretiny {
+namespace esphome::libretiny {
 
 void setup_preferences();
 
-}  // namespace libretiny
-}  // namespace esphome
+}  // namespace esphome::libretiny
 
 #endif  // USE_LIBRETINY