Make AnalysisQueryResult struct

Summary: For code navigation. Clear now where `AnalysisQueryResult` is created for example. Reviewed By: JakobDegen Differential Revision: D51315032 fbshipit-source-id: 14cf33550ba56d5541a1be154cd2d6dca0106780
facebook · Nov 15, 2023 · 8545fbf · 8545fbf
1 parent 64be60b
commit 8545fbf
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/app/buck2_analysis/src/analysis/calculation.rs b/app/buck2_analysis/src/analysis/calculation.rs
@@ -174,7 +174,12 @@ async fn resolve_queries_impl(
                     ))
                 }
 
-                anyhow::Ok((query.to_owned(), Arc::new(query_results)))
+                anyhow::Ok((
+                    query.to_owned(),
+                    Arc::new(AnalysisQueryResult {
+                        result: query_results,
+                    }),
+                ))
             }
         }))
         .await?;

diff --git a/app/buck2_analysis/src/analysis/env.rs b/app/buck2_analysis/src/analysis/env.rs
@@ -148,7 +148,7 @@ pub fn resolve_query<'v>(
     match query_results.get(query) {
         None => Err(anyhow::anyhow!(AnalysisError::MissingQuery(query.to_owned())).into()),
         Some(x) => {
-            for (_, y) in x.iter() {
+            for (_, y) in x.result.iter() {
                 // IMPORTANT: Anything given back to the user must be kept alive
                 module.frozen_heap().add_reference(y.value().owner());
             }

diff --git a/app/buck2_analysis/src/attrs/resolve/attr_type/arg/query.rs b/app/buck2_analysis/src/attrs/resolve/attr_type/arg/query.rs
@@ -30,6 +30,7 @@ impl ConfiguredQueryMacroBaseExt for QueryMacroBase<ConfiguredProvidersLabel> {
         match &self.expansion_type {
             QueryExpansion::Output => Ok(ResolvedQueryMacro::Outputs(
                 query_result
+                    .result
                     .iter()
                     .map(|(_, providers)| {
                         providers
@@ -42,6 +43,7 @@ impl ConfiguredQueryMacroBaseExt for QueryMacroBase<ConfiguredProvidersLabel> {
             )),
             QueryExpansion::Target => Ok(ResolvedQueryMacro::Targets(
                 query_result
+                    .result
                     .iter()
                     .map(|(target, _)| target.dupe())
                     .collect(),
@@ -54,6 +56,7 @@ impl ConfiguredQueryMacroBaseExt for QueryMacroBase<ConfiguredProvidersLabel> {
                             None => " ".to_owned().into_boxed_str(),
                         },
                         list: query_result
+                            .result
                             .iter()
                             .map(|(target, providers)| {
                                 (

diff --git a/app/buck2_analysis/src/attrs/resolve/attr_type/query.rs b/app/buck2_analysis/src/attrs/resolve/attr_type/query.rs
@@ -26,7 +26,7 @@ impl ConfiguredQueryAttrExt for QueryAttr<ConfiguredProvidersLabel> {
         let query_results = ctx.resolve_query(&self.query.query)?;
         let mut dependencies = Vec::new();
 
-        for (target, providers) in &*query_results {
+        for (target, providers) in &query_results.result {
             let providers_label =
                 ConfiguredProvidersLabel::new(target.dupe(), ProvidersName::Default);
             if !self.providers.is_empty() {

diff --git a/app/buck2_analysis/src/attrs/resolve/ctx.rs b/app/buck2_analysis/src/attrs/resolve/ctx.rs
@@ -17,7 +17,9 @@ use buck2_core::target::configured_target_label::ConfiguredTargetLabel;
 use starlark::environment::Module;
 use starlark::values::Heap;
 
-pub type AnalysisQueryResult = Vec<(ConfiguredTargetLabel, FrozenProviderCollectionValue)>;
+pub struct AnalysisQueryResult {
+    pub result: Vec<(ConfiguredTargetLabel, FrozenProviderCollectionValue)>,
+}
 
 /// The context for attribute resolution. Provides access to the providers from
 /// dependents.

diff --git a/app/buck2_audit_server/src/analysis_queries.rs b/app/buck2_audit_server/src/analysis_queries.rs
@@ -73,7 +73,7 @@ impl AuditSubcommand for AuditAnalysisQueriesCommand {
                                 writeln!(stdout, "{}:", label)?;
                                 for (query, result) in &query_results {
                                     writeln!(stdout, "  {}", query)?;
-                                    for (target, providers) in &**result {
+                                    for (target, providers) in &result.result {
                                         writeln!(stdout, "    {}", target.unconfigured())?;
                                         if self.include_outputs {
                                             let outputs = providers