Skip to content

Commit

Permalink
remove into diagnostic
Browse files Browse the repository at this point in the history
  • Loading branch information
wolfv committed Jan 17, 2025
1 parent 70db8ee commit 8a25c15
Showing 1 changed file with 3 additions and 6 deletions.
9 changes: 3 additions & 6 deletions crates/pixi-build/src/tools.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,15 @@ impl RattlerBuild {
let variant_configs = variant_configs.unwrap_or_default();

let mut variant_config =
VariantConfig::from_files(&variant_configs, &self.selector_config).into_diagnostic()?;
VariantConfig::from_files(&variant_configs, &self.selector_config)?;

if let Some(variant_config_input) = variant_config_input {
for (k, v) in variant_config_input.iter() {
variant_config.variants.insert(k.as_str().into(), v.clone());
}
}

variant_config
.find_variants(&outputs, &self.raw_recipe, &self.selector_config)
.into_diagnostic()
Ok(variant_config.find_variants(&outputs, &self.raw_recipe, &self.selector_config)?)
}

/// Get the outputs from the recipe.
Expand Down Expand Up @@ -162,8 +160,7 @@ impl RattlerBuild {
.collect::<Vec<ParsingError>>()
.into();
errs
})
.into_diagnostic()?;
})?;

if recipe.build().skip() {
eprintln!(
Expand Down

0 comments on commit 8a25c15

Please sign in to comment.