commit 203b33314b7448e3fe6118f365b011cc68f592bd
author Rob Mohr <mohrr@google.com> Sat May 22 10:43:46 2021 -0700
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Mon May 24 21:38:09 2021 +0000
tree ccbf728309674a82368c7197e81d66e9159d85c1
parent de9cc1b576ce2a2c01d56c3d7a944f7d8a605333

pw_presubmit, pw_result: Use inclusive language

Bug: 386
Change-Id: Id4e31e90d507e5814610dbbddc5259f829499826
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/46684
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>
Commit-Queue: Auto-Submit <auto-submit@pigweed.google.com.iam.gserviceaccount.com>
Reviewed-by: Wyatt Hepler <hepler@google.com>

pw_presubmit/py/pw_presubmit/pigweed_presubmit.py

diff --git a/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py b/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py
index 5e0e747..7c25990 100755
--- a/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py
+++ b/pw_presubmit/py/pw_presubmit/pigweed_presubmit.py
@@ -703,9 +703,11 @@
     """Entry point for presubmit."""
 
     if install:
+        # TODO(pwbug/209, pwbug/386) inclusive-language: disable
         install_hook(__file__, 'pre-push',
                      ['--base', 'origin/master..HEAD', '--program', 'quick'],
                      Path.cwd())
+        # TODO(pwbug/209, pwbug/386) inclusive-language: enable
         return 0
 
     return cli.run(**presubmit_args)

pw_result/public/pw_result/result.h

diff --git a/pw_result/public/pw_result/result.h b/pw_result/public/pw_result/result.h
index 642b667..3af06ae 100644
--- a/pw_result/public/pw_result/result.h
+++ b/pw_result/public/pw_result/result.h
@@ -38,10 +38,10 @@
   constexpr Result(std::in_place_t, Args&&... args)
       : value_(std::forward<Args>(args)...), status_(OkStatus()) {}
 
-  constexpr Result(Status status) : dummy_({}), status_(status) {
+  constexpr Result(Status status) : unused_({}), status_(status) {
     PW_ASSERT(!status_.ok());
   }
-  constexpr Result(Status::Code code) : dummy_({}), status_(code) {
+  constexpr Result(Status::Code code) : unused_({}), status_(code) {
     PW_ASSERT(!status_.ok());
   }
 
@@ -95,13 +95,13 @@
   constexpr void IgnoreError() const {}
 
  private:
-  struct Dummy {};
+  struct Unused {};
 
   union {
     T value_;
 
     // Ensure that there is always a trivial constructor for the union.
-    Dummy dummy_;
+    Unused unused_;
   };
   Status status_;
 };