mirror of
https://github.com/rust-lang/rust.git
synced 2024-11-24 07:44:10 +00:00
Allow macros to expand to or-patterns
This commit is contained in:
parent
9700addc82
commit
8a7f0d920e
@ -164,7 +164,6 @@ pub struct MissingOkOrSomeInTailExpr {
|
||||
pub struct MissingMatchArms {
|
||||
pub file: HirFileId,
|
||||
pub match_expr: AstPtr<ast::Expr>,
|
||||
pub arms: AstPtr<ast::MatchArmList>,
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
|
@ -1266,17 +1266,14 @@ impl DefWithBody {
|
||||
if let ast::Expr::MatchExpr(match_expr) =
|
||||
&source_ptr.value.to_node(&root)
|
||||
{
|
||||
if let (Some(match_expr), Some(arms)) =
|
||||
(match_expr.expr(), match_expr.match_arm_list())
|
||||
{
|
||||
if let Some(match_expr) = match_expr.expr() {
|
||||
acc.push(
|
||||
MissingMatchArms {
|
||||
file: source_ptr.file_id,
|
||||
match_expr: AstPtr::new(&match_expr),
|
||||
arms: AstPtr::new(&arms),
|
||||
}
|
||||
.into(),
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -900,6 +900,36 @@ fn foo() {
|
||||
);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn macro_or_pat() {
|
||||
check_diagnostics_no_bails(
|
||||
r#"
|
||||
macro_rules! m {
|
||||
() => {
|
||||
Enum::Type1 | Enum::Type2
|
||||
};
|
||||
}
|
||||
|
||||
enum Enum {
|
||||
Type1,
|
||||
Type2,
|
||||
Type3,
|
||||
}
|
||||
|
||||
fn f(ty: Enum) {
|
||||
match ty {
|
||||
//^^ error: missing match arm
|
||||
m!() => (),
|
||||
}
|
||||
|
||||
match ty {
|
||||
m!() | Enum::Type3 => ()
|
||||
}
|
||||
}
|
||||
"#,
|
||||
);
|
||||
}
|
||||
|
||||
mod false_negatives {
|
||||
//! The implementation of match checking here is a work in progress. As we roll this out, we
|
||||
//! prefer false negatives to false positives (ideally there would be no false positives). This
|
||||
|
@ -112,7 +112,7 @@ pub(crate) mod entry {
|
||||
|
||||
pub(crate) fn pattern(p: &mut Parser) {
|
||||
let m = p.start();
|
||||
patterns::pattern_single(p);
|
||||
patterns::pattern_top(p);
|
||||
if p.at(EOF) {
|
||||
m.abandon(p);
|
||||
return;
|
||||
|
Loading…
Reference in New Issue
Block a user