diff options
author | Edwin Cheng <[email protected]> | 2020-03-21 15:41:07 +0000 |
---|---|---|
committer | Edwin Cheng <[email protected]> | 2020-03-21 15:41:07 +0000 |
commit | 9ff50d7e839c635632021d47e2dd3982916e4738 (patch) | |
tree | 862b770aa370865929e2a2fc240cf633475dc9c5 | |
parent | 6d6606895cf15998a71a23c6d5e78dc955153b4e (diff) |
Move test to hir_ty
-rw-r--r-- | crates/ra_hir_ty/src/tests/regression.rs | 31 | ||||
-rw-r--r-- | crates/ra_ide/src/diagnostics.rs | 30 |
2 files changed, 31 insertions, 30 deletions
diff --git a/crates/ra_hir_ty/src/tests/regression.rs b/crates/ra_hir_ty/src/tests/regression.rs index 14c8ed3a9..a02e3ee05 100644 --- a/crates/ra_hir_ty/src/tests/regression.rs +++ b/crates/ra_hir_ty/src/tests/regression.rs | |||
@@ -453,3 +453,34 @@ pub mod str { | |||
453 | // should be Option<char>, but currently not because of Chalk ambiguity problem | 453 | // should be Option<char>, but currently not because of Chalk ambiguity problem |
454 | assert_eq!("(Option<{unknown}>, Option<{unknown}>)", super::type_at_pos(&db, pos)); | 454 | assert_eq!("(Option<{unknown}>, Option<{unknown}>)", super::type_at_pos(&db, pos)); |
455 | } | 455 | } |
456 | |||
457 | #[test] | ||
458 | fn issue_3642_bad_macro_stackover() { | ||
459 | let (db, pos) = TestDB::with_position( | ||
460 | r#" | ||
461 | //- /main.rs | ||
462 | #[macro_export] | ||
463 | macro_rules! match_ast { | ||
464 | (match $node:ident { $($tt:tt)* }) => { match_ast!(match ($node) { $($tt)* }) }; | ||
465 | |||
466 | (match ($node:expr) { | ||
467 | $( ast::$ast:ident($it:ident) => $res:expr, )* | ||
468 | _ => $catch_all:expr $(,)? | ||
469 | }) => {{ | ||
470 | $( if let Some($it) = ast::$ast::cast($node.clone()) { $res } else )* | ||
471 | { $catch_all } | ||
472 | }}; | ||
473 | } | ||
474 | |||
475 | fn main() { | ||
476 | let anchor<|> = match_ast! { | ||
477 | match parent { | ||
478 | as => {}, | ||
479 | _ => return None | ||
480 | } | ||
481 | }; | ||
482 | }"#, | ||
483 | ); | ||
484 | |||
485 | assert_eq!("()", super::type_at_pos(&db, pos)); | ||
486 | } | ||
diff --git a/crates/ra_ide/src/diagnostics.rs b/crates/ra_ide/src/diagnostics.rs index 50106e31e..a10e642db 100644 --- a/crates/ra_ide/src/diagnostics.rs +++ b/crates/ra_ide/src/diagnostics.rs | |||
@@ -715,34 +715,4 @@ fn main() { | |||
715 | check_struct_shorthand_initialization, | 715 | check_struct_shorthand_initialization, |
716 | ); | 716 | ); |
717 | } | 717 | } |
718 | |||
719 | #[test] | ||
720 | fn test_bad_macro_stackover() { | ||
721 | check_no_diagnostic( | ||
722 | r#" | ||
723 | //- /main.rs | ||
724 | #[macro_export] | ||
725 | macro_rules! match_ast { | ||
726 | (match $node:ident { $($tt:tt)* }) => { match_ast!(match ($node) { $($tt)* }) }; | ||
727 | |||
728 | (match ($node:expr) { | ||
729 | $( ast::$ast:ident($it:ident) => $res:expr, )* | ||
730 | _ => $catch_all:expr $(,)? | ||
731 | }) => {{ | ||
732 | $( if let Some($it) = ast::$ast::cast($node.clone()) { $res } else )* | ||
733 | { $catch_all } | ||
734 | }}; | ||
735 | } | ||
736 | |||
737 | fn main() { | ||
738 | let anchor = match_ast! { | ||
739 | match parent { | ||
740 | as => {}, | ||
741 | _ => return None | ||
742 | } | ||
743 | }; | ||
744 | } | ||
745 | "#, | ||
746 | ); | ||
747 | } | ||
748 | } | 718 | } |