Commit 54dd30f6 authored by Luke Sandberg's avatar Luke Sandberg

cargo fmt formatting fix

parent d35a6b6b
...@@ -813,9 +813,7 @@ impl ResolveResult { ...@@ -813,9 +813,7 @@ impl ResolveResult {
} }
/// Iterates `(key, value)` pairs. `key` is `None` when keys were not collected. /// Iterates `(key, value)` pairs. `key` is `None` when keys were not collected.
pub fn iter_primary( pub fn iter_primary(&self) -> impl Iterator<Item = (Option<&RequestKey>, &ResolveResultItem)> {
&self,
) -> impl Iterator<Item = (Option<&RequestKey>, &ResolveResultItem)> {
debug_assert!( debug_assert!(
self.primary_keys.is_empty() || self.primary_keys.len() == self.primary_values.len(), self.primary_keys.is_empty() || self.primary_keys.len() == self.primary_values.len(),
"primary_keys and primary_values length mismatch" "primary_keys and primary_values length mismatch"
...@@ -1776,8 +1774,7 @@ async fn resolve_raw_inner( ...@@ -1776,8 +1774,7 @@ async fn resolve_raw_inner(
) )
.await?; .await?;
results.extend( results.extend(
collect_matches(&matches, collect_affecting_sources, collect_request_keys) collect_matches(&matches, collect_affecting_sources, collect_request_keys).await?,
.await?
); );
} }
...@@ -1785,7 +1782,9 @@ async fn resolve_raw_inner( ...@@ -1785,7 +1782,9 @@ async fn resolve_raw_inner(
let matches = let matches =
read_matches(lookup_dir.clone(), rcstr!(""), force_in_lookup_dir, path).await?; read_matches(lookup_dir.clone(), rcstr!(""), force_in_lookup_dir, path).await?;
results.extend(collect_matches(&matches, collect_affecting_sources, collect_request_keys).await?); results.extend(
collect_matches(&matches, collect_affecting_sources, collect_request_keys).await?,
);
} }
Ok(merge_results(results)) Ok(merge_results(results))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment