Migrate back to cquery/uquery

Summary: Migrate back to `cquery()`, now that the cell alias resolution has been fixed within BXL

Reviewed By: scottcao

Differential Revision: D43834953

fbshipit-source-id: a16dded23636c2d6347cb13b392efb2a680376fb

omnibus_tools/find_exclusions.bxl

@@ -32,7 +32,7 @@ def _find_exclusions_impl(ctx):
         "ovr_config//platform/linux:x86_64-fbcode-platform010-clang"
     )
 
-    cquery = ctx.cquery_legacy(platform)
+    cquery = ctx.cquery(platform)
 
     # Note: ideally we'd just do all of third-party here, but there are some
     # targets files that don't parse there, so for now this adds ucc ad-hoc,

omnibus_tools/find_implicit_roots.bxl

@@ -21,7 +21,7 @@ def _find_implicit_roots(ctx):
         "ovr_config//platform/linux:x86_64-fbcode-platform010-clang"
     )
 
-    targets = ctx.cquery_legacy(platform).eval("kind('^python_(binary|test)', %s)", query_args = [ctx.cli_args.targets])
+    targets = ctx.cquery(platform).eval("kind('^python_(binary|test)', %s)", query_args = [ctx.cli_args.targets])
     targets = _flatten(targets.values())
     all_analysis = ctx.analysis([configured_sub_target(t.label, "omnibus") for t in targets])
 

prelude/erlang/shell/shell.bxl

@@ -12,8 +12,8 @@ def _deduped_paths(paths):
     }.values())
 
 def _ebin_paths(ctx):
-    test_target = ctx.cquery_legacy().kind("erlang_test", ctx.cquery_legacy().owner(ctx.cli_args.source))
-    app_target = ctx.cquery_legacy().kind("erlang_app$", ctx.cquery_legacy().owner(ctx.cli_args.source))
+    test_target = ctx.cquery().kind("erlang_test", ctx.cquery().owner(ctx.cli_args.source))
+    app_target = ctx.cquery().kind("erlang_app$", ctx.cquery().owner(ctx.cli_args.source))
 
     target = test_target + app_target
 

prelude/python/sourcedb/classic.bxl

@@ -10,7 +10,7 @@ load(":merge.bxl", "do_merge")
 load(":query.bxl", "do_query")
 
 def _build_entry_point(ctx: "bxl_ctx") -> None:
-    query = ctx.cquery_legacy()
+    query = ctx.cquery()
     actions = ctx.bxl_actions.action_factory()
     targets = do_query(ctx, query, actions, [query.eval(target) for target in ctx.cli_args.target])
     built_sourcedbs = do_build(ctx, targets)

prelude/python/sourcedb/code_navigation.bxl

@@ -10,7 +10,7 @@ load(":merge.bxl", "do_merge")
 load(":query.bxl", "do_query")
 
 def _build_entry_point(ctx: "bxl_ctx") -> None:
-    query = ctx.cquery_legacy()
+    query = ctx.cquery()
     actions = ctx.bxl_actions.action_factory()
     root = ctx.root()
 

prelude/python/sourcedb/query.bxl

@@ -85,7 +85,7 @@ def do_query(
     return _expand_and_filter_dependencies(ctx, actions, root_targets)
 
 def _do_query_entry_point(ctx: "bxl_ctx") -> None:
-    targets = do_query(ctx, ctx.cquery_legacy(), ctx.bxl_actions.action_factory(), ctx.cli_args.target)
+    targets = do_query(ctx, ctx.cquery(), ctx.bxl_actions.action_factory(), ctx.cli_args.target)
     ctx.output.print_json([target.raw_target() for target in targets])
 
 query = bxl(