From e34532f2835adf621d22d3ae9b3c6023d71e46d5 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Sat, 10 Jan 2026 16:42:35 -1000
Subject: [PATCH] [sensor] Use C++17 nested namespace syntax (#13116)

---
 esphome/components/sensor/automation.cpp | 6 ++----
 esphome/components/sensor/automation.h   | 6 ++----
 esphome/components/sensor/filter.cpp     | 6 ++----
 esphome/components/sensor/filter.h       | 6 ++----
 esphome/components/sensor/sensor.cpp     | 6 ++----
 esphome/components/sensor/sensor.h       | 6 ++----
 6 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/esphome/components/sensor/automation.cpp b/esphome/components/sensor/automation.cpp
index f53c43d1f6..977719db9b 100644
--- a/esphome/components/sensor/automation.cpp
+++ b/esphome/components/sensor/automation.cpp
@@ -1,10 +1,8 @@
 #include "automation.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace sensor {
+namespace esphome::sensor {
 
 static const char *const TAG = "sensor.automation";
 
-}  // namespace sensor
-}  // namespace esphome
+}  // namespace esphome::sensor
diff --git a/esphome/components/sensor/automation.h b/esphome/components/sensor/automation.h
index df7d31a0c9..996c7fc9b5 100644
--- a/esphome/components/sensor/automation.h
+++ b/esphome/components/sensor/automation.h
@@ -4,8 +4,7 @@
 #include "esphome/core/automation.h"
 #include "esphome/components/sensor/sensor.h"
 
-namespace esphome {
-namespace sensor {
+namespace esphome::sensor {
 
 class SensorStateTrigger : public Trigger<float> {
  public:
@@ -107,5 +106,4 @@ template<typename... Ts> class SensorInRangeCondition : public Condition<Ts...>
   float max_{NAN};
 };
 
-}  // namespace sensor
-}  // namespace esphome
+}  // namespace esphome::sensor
diff --git a/esphome/components/sensor/filter.cpp b/esphome/components/sensor/filter.cpp
index c8c6540112..8450ec4c4e 100644
--- a/esphome/components/sensor/filter.cpp
+++ b/esphome/components/sensor/filter.cpp
@@ -5,8 +5,7 @@
 #include "esphome/core/log.h"
 #include "sensor.h"
 
-namespace esphome {
-namespace sensor {
+namespace esphome::sensor {
 
 static const char *const TAG = "sensor.filter";
 
@@ -574,5 +573,4 @@ void StreamingMovingAverageFilter::reset_batch() {
   this->valid_count_ = 0;
 }
 
-}  // namespace sensor
-}  // namespace esphome
+}  // namespace esphome::sensor
diff --git a/esphome/components/sensor/filter.h b/esphome/components/sensor/filter.h
index 92a9184c18..15c7656a7b 100644
--- a/esphome/components/sensor/filter.h
+++ b/esphome/components/sensor/filter.h
@@ -7,8 +7,7 @@
 #include "esphome/core/component.h"
 #include "esphome/core/helpers.h"
 
-namespace esphome {
-namespace sensor {
+namespace esphome::sensor {
 
 class Sensor;
 
@@ -632,5 +631,4 @@ class StreamingMovingAverageFilter : public StreamingFilter {
   size_t valid_count_{0};
 };
 
-}  // namespace sensor
-}  // namespace esphome
+}  // namespace esphome::sensor
diff --git a/esphome/components/sensor/sensor.cpp b/esphome/components/sensor/sensor.cpp
index c1d28bf260..64678f8d0c 100644
--- a/esphome/components/sensor/sensor.cpp
+++ b/esphome/components/sensor/sensor.cpp
@@ -3,8 +3,7 @@
 #include "esphome/core/controller_registry.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace sensor {
+namespace esphome::sensor {
 
 static const char *const TAG = "sensor";
 
@@ -135,5 +134,4 @@ void Sensor::internal_send_state_to_frontend(float state) {
 #endif
 }
 
-}  // namespace sensor
-}  // namespace esphome
+}  // namespace esphome::sensor
diff --git a/esphome/components/sensor/sensor.h b/esphome/components/sensor/sensor.h
index a792c0d3fd..d9046020f6 100644
--- a/esphome/components/sensor/sensor.h
+++ b/esphome/components/sensor/sensor.h
@@ -9,8 +9,7 @@
 #include <initializer_list>
 #include <memory>
 
-namespace esphome {
-namespace sensor {
+namespace esphome::sensor {
 
 void log_sensor(const char *tag, const char *prefix, const char *type, Sensor *obj);
 
@@ -143,5 +142,4 @@ class Sensor : public EntityBase, public EntityBase_DeviceClass, public EntityBa
   } sensor_flags_{};
 };
 
-}  // namespace sensor
-}  // namespace esphome
+}  // namespace esphome::sensor