From 9057e528c7148dd22f92b2dbf1e654ab8a3f5cd9 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 18 Feb 2025 10:24:23 +1100 Subject: [PATCH] Tools: prevent "struct" being removed from timezone macOS requires this. --- tools/utils_maintenance/code_clean.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tools/utils_maintenance/code_clean.py b/tools/utils_maintenance/code_clean.py index d5cb667fdb6..83f888c4e7e 100755 --- a/tools/utils_maintenance/code_clean.py +++ b/tools/utils_maintenance/code_clean.py @@ -982,11 +982,17 @@ class edit_generators: span_skip.add(match.span(1)) # Remove `struct` - for match in re.finditer(r"\b(struct)\s+[a-zA-Z0-9_]+", data): + for match in re.finditer(r"\b(struct)\s+([a-zA-Z0-9_]+)", data): span = match.span(1) if span in span_skip: continue + if match.group(2) in { + # macOS requires a leading `struct` while Linux doesn't. + "timezone", + }: + continue + edits.append(Edit( span=span, content=' ',