commit 100d2a546d02122bb5114e2c3413dc482eac7cd4
author danakj <danakj@chromium.org> Wed Feb 01 16:08:44 2023
committer Copybara-Service <copybara-worker@google.com> Wed Feb 01 16:13:58 2023
tree 0620dec93cd07f9be631655368f583eabc7c0fdd
parent 4f9551c63d837827b0b9a735a8f4aa11969ed194

Avoid variable name shadowing

This is an error in the next clang roll.

FAILED: obj/third_party/ipcz/src/ipcz_test_support_chromium/multinode_test.o
../../third_party/llvm-build/Release+Asserts/bin/clang++ -MMD -MF obj/third_party/ipcz/src/ipcz_test...(too long)
../../third_party/ipcz/src/test/multinode_test.cc:507:36: error: declaration shadows a structured binding [-Werror,-Wshadow]
[factory = test.factory, test_driver = test_driver] {
^
../../third_party/ipcz/src/test/multinode_test.cc:501:41: note: previous declaration is here
for (const auto& [test_driver_name, test_driver] : GetTestDrivers()) {
^
1 error generated.

R=rockot@chromium.org

Fixes: 1412080
Change-Id: Id1e9beb6ee9949b06b8fbd5ffe27b0a951d2850e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4212132
Reviewed-by: Ken Rockot <rockot@google.com>
Commit-Queue: Ken Rockot <rockot@google.com>
Cr-Commit-Position: refs/heads/main@{#1099862}
NOKEYCHECK=True
GitOrigin-RevId: 9cd77fc191fbd49b29f437daef8b6125472df8d9

src/test/multinode_test.cc

diff --git a/src/test/multinode_test.cc b/src/test/multinode_test.cc
index 8b3f4de..fdbde41 100644
--- a/src/test/multinode_test.cc
+++ b/src/test/multinode_test.cc
@@ -501,12 +501,11 @@
     for (const auto& [test_driver_name, test_driver] : GetTestDrivers()) {
       const std::string test_name =
           absl::StrCat(test.test_name, "/", test_driver_name);
-      ::testing::RegisterTest(
-          test.test_suite_name, test_name.c_str(), nullptr, nullptr,
-          test.filename, test.line,
-          [factory = test.factory, test_driver = test_driver] {
-            return factory(test_driver);
-          });
+      ::testing::RegisterTest(test.test_suite_name, test_name.c_str(), nullptr,
+                              nullptr, test.filename, test.line,
+                              [factory = test.factory, driver = test_driver] {
+                                return factory(driver);
+                              });
     }
   }
 }