Skip to content

fix: fix ICE in custom-test-frameworks feature #109301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 20, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 24 additions & 2 deletions compiler/rustc_builtin_macros/src/test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,23 @@ pub fn expand_test_case(
}

let sp = ecx.with_def_site_ctxt(attr_sp);
let mut item = anno_item.expect_item();
let (mut item, is_stmt) = match anno_item {
Annotatable::Item(item) => (item, false),
Annotatable::Stmt(stmt) if let ast::StmtKind::Item(_) = stmt.kind => if let ast::StmtKind::Item(i) = stmt.into_inner().kind {
(i, true)
} else {
unreachable!()
},
_ => {
ecx.struct_span_err(
anno_item.span(),
"`#[test_case]` attribute is only allowed on items",
)
.emit();

return vec![];
}
};
item = item.map(|mut item| {
let test_path_symbol = Symbol::intern(&item_path(
// skip the name of the root module
Expand All @@ -50,7 +66,13 @@ pub fn expand_test_case(
item
});

return vec![Annotatable::Item(item)];
let ret = if is_stmt {
Annotatable::Stmt(P(ecx.stmt_item(item.span, item)))
} else {
Annotatable::Item(item)
};

vec![ret]
}

pub fn expand_test(
Expand Down
10 changes: 10 additions & 0 deletions tests/ui/test-attrs/custom-test-frameworks/issue-107454.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
// compile-flags: --test

#![feature(custom_test_frameworks)]
#![deny(unnameable_test_items)]

fn foo() {
#[test_case]
//~^ ERROR cannot test inner items [unnameable_test_items]
fn test2() {}
}
15 changes: 15 additions & 0 deletions tests/ui/test-attrs/custom-test-frameworks/issue-107454.stderr
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
error: cannot test inner items
--> $DIR/issue-107454.rs:7:5
|
LL | #[test_case]
| ^^^^^^^^^^^^
|
note: the lint level is defined here
--> $DIR/issue-107454.rs:4:9
|
LL | #![deny(unnameable_test_items)]
| ^^^^^^^^^^^^^^^^^^^^^
= note: this error originates in the attribute macro `test_case` (in Nightly builds, run with -Z macro-backtrace for more info)

error: aborting due to previous error