bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix ICE for nested test function with arguments.

Browse source
This commit is contained in:
Lukas Markeffsky 2023-06-06 23:28:15 +02:00
parent 3572d7451d
commit 4bf00613ee
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_builtin_macros/src/test.rs
View file

@ -122,11 +122,7 @@ pub fn expand_test_or_bench(
let ast::ItemKind::Fn(fn_) = &item.kind else { let ast::ItemKind::Fn(fn_) = &item.kind else {
not_testable_error(cx, attr_sp, Some(&item)); not_testable_error(cx, attr_sp, Some(&item));
return if is_stmt { return if is_stmt {
vec![Annotatable::Stmt(P(ast::Stmt { vec![Annotatable::Stmt(P(cx.stmt_item(item.span, item)))]
id: ast::DUMMY_NODE_ID,
span: item.span,
kind: ast::StmtKind::Item(item),
}))]
} else { } else {
vec![Annotatable::Item(item)] vec![Annotatable::Item(item)]
}; };
@ -138,7 +134,11 @@ pub fn expand_test_or_bench(
if (!is_bench && !has_test_signature(cx, &item)) if (!is_bench && !has_test_signature(cx, &item))
|| (is_bench && !has_bench_signature(cx, &item)) || (is_bench && !has_bench_signature(cx, &item))
{ {
return vec![Annotatable::Item(item)]; return if is_stmt {
vec![Annotatable::Stmt(P(cx.stmt_item(item.span, item)))]
} else {
vec![Annotatable::Item(item)]
};
} }
let sp = cx.with_def_site_ctxt(item.span); let sp = cx.with_def_site_ctxt(item.span);