Fix shadowed variable in watchman/root/Root.h

Summary:
Our upcoming compiler upgrade will require us not to have shadowed variables. Such variables have a _high_ bug rate and reduce readability, so we would like to avoid them even if the compiler was not forcing us to do so.

This codemod attempts to fix an instance of a shadowed variable. Please review with care: if it's failed the result will be a silent bug.

**What's a shadowed variable?**

Shadowed variables are variables in an inner scope with the same name as another variable in an outer scope. Having the same name for both variables might be semantically correct, but it can make the code confusing to read! It can also hide subtle bugs.

This diff fixes such an issue by renaming the variable.

 - If you approve of this diff, please use the "Accept & Ship" button :-)

Reviewed By: palmje

Differential Revision: D52582786

fbshipit-source-id: c5099d76d5d16886b0e9c4b060e8ff20a56e6429

Author: r-barnes

watchman/root/Root.h

@@ -155,8 +155,9 @@ struct RootQueryInfo : serde::Object {
     x("state", state);
     x("client-pid", client_pid);
     x("request-id", request_id);
-    x.skip_if(
-        "query", query, [](const auto& query) { return !query.has_value(); });
+    x.skip_if("query", query, [](const auto& query_2) {
+      return !query_2.has_value();
+    });
   }
 };