chore: fmt

This commit is contained in:
2026-01-31 15:39:06 +08:00
parent b8f8b5764d
commit cb539c52c3
5 changed files with 42 additions and 15 deletions

View File

@@ -417,7 +417,11 @@ impl DowngradeContext for DowngradeCtx<'_> {
let range = (start..start + slots).map(ExprId);
let span = synthetic_span();
// Fill reserved slots with placeholder value
self.irs.extend(range.clone().map(|slot| Thunk { inner: slot, span }.to_ir()));
self.irs.extend(
range
.clone()
.map(|slot| Thunk { inner: slot, span }.to_ir()),
);
range
}
@@ -427,9 +431,7 @@ impl DowngradeContext for DowngradeCtx<'_> {
let thunks = self.pop_thunk_scope();
let span = self.get_ir(body).span();
let top_level = self.new_expr(TopLevel { body, thunks, span }.to_ir());
self.ctx
.irs
.extend(self.irs);
self.ctx.irs.extend(self.irs);
Ok(top_level)
}

View File

@@ -139,7 +139,14 @@ impl<Ctx: DowngradeContext> Downgrade<Ctx> for ast::Path {
part
}
} else {
ctx.new_expr(ConcatStrings { parts, span, force_string: false }.to_ir())
ctx.new_expr(
ConcatStrings {
parts,
span,
force_string: false,
}
.to_ir(),
)
};
Ok(ctx.new_expr(Path { expr, span }.to_ir()))
}
@@ -166,7 +173,14 @@ impl<Ctx: DowngradeContext> Downgrade<Ctx> for ast::Str {
Ok(if is_single_literal {
parts.into_iter().next().unwrap()
} else {
ctx.new_expr(ConcatStrings { parts, span, force_string: true }.to_ir())
ctx.new_expr(
ConcatStrings {
parts,
span,
force_string: true,
}
.to_ir(),
)
})
}
}

View File

@@ -442,7 +442,14 @@ pub fn downgrade_attr(attr: ast::Attr, ctx: &mut impl DowngradeContext) -> Resul
})
.collect::<Result<Vec<_>>>()?;
Ok(Attr::Dynamic(
ctx.new_expr(ConcatStrings { parts, span, force_string: true }.to_ir()),
ctx.new_expr(
ConcatStrings {
parts,
span,
force_string: true,
}
.to_ir(),
),
span,
))
}
@@ -825,7 +832,7 @@ fn finalize_pending_value<Ctx: DowngradeContext, const ALLOW_DYN: bool>(
/// Check that an expression doesn't contain dynamic attributes (for let bindings).
fn check_no_dynamic_attrs(expr: &ast::Expr, ctx: &impl DowngradeContext) -> Result<()> {
let ast::Expr::AttrSet(attrset) = expr else {
return Ok(())
return Ok(());
};
for v in attrset.attrpath_values() {
v.attrpath().unwrap().attrs().try_for_each(|attr| {

View File

@@ -532,9 +532,7 @@ fn op_get_env(#[string] key: String) -> std::result::Result<String, NixError> {
#[deno_core::op2]
#[serde]
fn op_walk_dir(
#[string] path: String,
) -> std::result::Result<Vec<(String, String)>, NixError> {
fn op_walk_dir(#[string] path: String) -> std::result::Result<Vec<(String, String)>, NixError> {
fn walk_recursive(
base: &Path,
current: &Path,
@@ -602,7 +600,10 @@ fn op_add_filtered_path<Ctx: RuntimeContext>(
let src = Path::new(&src_path);
if !src.exists() {
return Err(NixError::from(format!("path '{}' does not exist", src_path)));
return Err(NixError::from(format!(
"path '{}' does not exist",
src_path
)));
}
let computed_name = name.unwrap_or_else(|| {
@@ -657,8 +658,8 @@ fn op_add_filtered_path<Ctx: RuntimeContext>(
"when 'recursive' is false, path must be a regular file",
));
}
let contents = fs::read(&dest)
.map_err(|e| NixError::from(format!("failed to read file: {}", e)))?;
let contents =
fs::read(&dest).map_err(|e| NixError::from(format!("failed to read file: {}", e)))?;
let mut hasher = Sha256::new();
hasher.update(&contents);
hex::encode(hasher.finalize())

View File

@@ -186,7 +186,10 @@ eval_okay_test!(
import
);
eval_okay_test!(inherit_attr_pos);
eval_okay_test!(inherit_from);
eval_okay_test!(
#[ignore = "__overrides is not supported"]
inherit_from
);
eval_okay_test!(intersectAttrs);
eval_okay_test!(r#let);
eval_okay_test!(list);