mirror of
https://github.com/esphome/esphome.git
synced 2026-10-14 10:12:52 +00:00
Merge remote-tracking branch 'origin/dev' into HEAD
# Conflicts: # esphome/components/mqtt/mqtt_button.cpp # esphome/components/mqtt/mqtt_lock.cpp # esphome/components/mqtt/mqtt_switch.cpp # esphome/components/mqtt/mqtt_update.cpp
This commit is contained in:
+2
-7
@@ -1065,7 +1065,8 @@ HEAP_ALLOCATING_HELPERS = {
|
||||
r"str_sprintf|"
|
||||
r"str_snprintf|"
|
||||
r"value_accuracy_to_string"
|
||||
r")\s*\(" + CPP_RE_EOL,
|
||||
# Explicit template arguments at any nesting depth, e.g. format_hex<std::array<uint8_t, 4>>(
|
||||
r")\s*(?:<[^;{}()\n]*>\s*)?\(" + CPP_RE_EOL,
|
||||
include=cpp_include,
|
||||
exclude=[
|
||||
# The definitions themselves
|
||||
@@ -1273,12 +1274,6 @@ def lint_no_std_nothrow(fname, match):
|
||||
r"\s*(?:=\s*\{?|[{(])\s*\"",
|
||||
prefilter="TAG",
|
||||
include=["esphome/components/*.cpp", "esphome/components/**/*.cpp"],
|
||||
# Deprecated components, converted in a follow-up PR
|
||||
exclude=[
|
||||
"esphome/components/st7735/*",
|
||||
"esphome/components/st7789v/*",
|
||||
"esphome/components/waveshare_epaper/*",
|
||||
],
|
||||
)
|
||||
def lint_log_tag_macro(fname, match):
|
||||
return (
|
||||
|
||||
Reference in New Issue
Block a user