From 6a840f0854d5e262907e10852f831ebff4c6bd31 Mon Sep 17 00:00:00 2001
From: Fuchsia Authors <noreply@google.com>
Date: Wed, 21 Aug 2024 23:34:15 +0000
Subject: [PATCH] third_party/fuchsia: Copybara import
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GitOrigin-RevId: e9e727d384934af95fca79b42ef3fe5004e9a58f
Change-Id: I44b2ddd3346f2258815e3f308aa303d6fb348abe
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/231293
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
Presubmit-Verified: CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Armando Montanez <amontanez@google.com>
Pigweed-Auto-Submit: Wyatt Hepler <hepler@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed-service-accounts.iam.gserviceaccount.com>
---
 .../repo/sdk/lib/fit/include/lib/fit/internal/result.h   | 9 ++++++++-
 .../fuchsia/repo/sdk/lib/fit/include/lib/fit/result.h    | 6 ++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/third_party/fuchsia/repo/sdk/lib/fit/include/lib/fit/internal/result.h b/third_party/fuchsia/repo/sdk/lib/fit/include/lib/fit/internal/result.h
index fe90c10d33..dfbf90a213 100644
--- a/third_party/fuchsia/repo/sdk/lib/fit/include/lib/fit/internal/result.h
+++ b/third_party/fuchsia/repo/sdk/lib/fit/include/lib/fit/internal/result.h
@@ -14,6 +14,11 @@
 #include <type_traits>
 #include <utility>
 
+#include "pw_preprocessor/compiler.h"
+
+PW_MODIFY_DIAGNOSTICS_PUSH();
+PW_MODIFY_DIAGNOSTIC_CLANG(ignored, "-Wshadow-field-in-constructor");
+
 namespace fit {
 
 // Forward declarations.
@@ -60,7 +65,7 @@ struct template_matcher {
 };
 
 template <typename T, template <typename...> class U, typename = bool>
-struct is_match : decltype(template_matcher<U>::match(std::declval<T>())) {};
+struct is_match : decltype(template_matcher<U>::match(std::declval<T>())){};
 
 template <typename T, template <typename...> class U>
 struct is_match<T, U, requires_conditions<std::is_void<T>>> : std::false_type {};
@@ -441,4 +446,6 @@ using storage = storage_type<storage_class_trait<E, Ts...>, E, Ts...>;
 }  // namespace internal
 }  // namespace fit
 
+PW_MODIFY_DIAGNOSTICS_POP();
+
 #endif  // LIB_FIT_INTERNAL_RESULT_H_
diff --git a/third_party/fuchsia/repo/sdk/lib/fit/include/lib/fit/result.h b/third_party/fuchsia/repo/sdk/lib/fit/include/lib/fit/result.h
index 86bbb9041f..bc2be9c29f 100644
--- a/third_party/fuchsia/repo/sdk/lib/fit/include/lib/fit/result.h
+++ b/third_party/fuchsia/repo/sdk/lib/fit/include/lib/fit/result.h
@@ -56,6 +56,10 @@
 //                               // fit::result<E>).
 
 #include "pw_assert/assert.h"
+#include "pw_preprocessor/compiler.h"
+
+PW_MODIFY_DIAGNOSTICS_PUSH();
+PW_MODIFY_DIAGNOSTIC_CLANG(ignored, "-Wshadow-field-in-constructor");
 
 namespace fit {
 
@@ -803,4 +807,6 @@ constexpr bool operator>=(const T& lhs, const result<F, U>& rhs) {
 
 }  // namespace fit
 
+PW_MODIFY_DIAGNOSTICS_POP();
+
 #endif  // LIB_FIT_RESULT_H_