future proof structure

3 files changed, 143 insertions, 135 deletions

diff --git a/crates/hir_def/src/macro_expansion_tests.rs b/crates/hir_def/src/macro_expansion_tests.rs
index a5e941454c0..76bd0299fb4 100644
--- a/crates/hir_def/src/macro_expansion_tests.rs
+++ b/crates/hir_def/src/macro_expansion_tests.rs
@@ -9,10 +9,12 @@
 //! write unit-tests (in fact, we used to do that), but that makes tests brittle
 //! and harder to understand.
 
+mod mbe;
+
 use std::{iter, ops::Range};
 
 use base_db::{fixture::WithFixture, SourceDatabase};
-use expect_test::{expect, Expect};
+use expect_test::Expect;
 use hir_expand::{db::AstDatabase, InFile, MacroFile};
 use stdx::format_to;
 use syntax::{
@@ -113,137 +115,3 @@ fn pretty_print_macro_expansion(expn: SyntaxNode) -> String {
     }
     res
 }
-
-#[test]
-fn wrong_nesting_level() {
-    check(
-        r#"
-macro_rules! m {
-    ($($i:ident);*) => ($i)
-}
-m!{a}
-"#,
-        expect![[r#"
-macro_rules! m {
-    ($($i:ident);*) => ($i)
-}
-/* error: expected simple binding, found nested binding `i` */
-"#]],
-    );
-}
-
-#[test]
-fn expansion_does_not_parse_as_expression() {
-    check(
-        r#"
-macro_rules! stmts {
-    () => { let _ = 0; }
-}
-
-fn f() { let _ = stmts!(); }
-"#,
-        expect![[r#"
-macro_rules! stmts {
-    () => { let _ = 0; }
-}
-
-fn f() { let _ = /* error: could not convert tokens */; }
-"#]],
-    )
-}
-
-#[test]
-fn round_trips_compound_tokens() {
-    check(
-        r#"
-macro_rules! m {
-    () => { type qual: ::T = qual::T; }
-}
-m!();
-"#,
-        expect![[r#"
-macro_rules! m {
-    () => { type qual: ::T = qual::T; }
-}
-type qual: ::T = qual::T;
-"#]],
-    )
-}
-
-#[test]
-fn round_trips_literals() {
-    check(
-        r#"
-macro_rules! m {
-    () => {
-        let _ = 'c';
-        let _ = 1000;
-        let _ = 12E+99_f64;
-        let _ = "rust1";
-        let _ = -92;
-    }
-}
-fn f() {
-    m!()
-}
-"#,
-        expect![[r#"
-macro_rules! m {
-    () => {
-        let _ = 'c';
-        let _ = 1000;
-        let _ = 12E+99_f64;
-        let _ = "rust1";
-        let _ = -92;
-    }
-}
-fn f() {
-    let_ = 'c';
-    let_ = 1000;
-    let_ = 12E+99_f64;
-    let_ = "rust1";
-    let_ = -92;
-}
-"#]],
-    );
-}
-
-#[test]
-fn broken_parenthesis_sequence() {
-    check(
-        r#"
-macro_rules! m1 { ($x:ident) => { ($x } }
-macro_rules! m2 { ($x:ident) => {} }
-
-m1!();
-m2!(x
-"#,
-        expect![[r#"
-macro_rules! m1 { ($x:ident) => { ($x } }
-macro_rules! m2 { ($x:ident) => {} }
-
-/* error: Failed to find macro definition */
-/* error: Failed to lower macro args to token tree */
-"#]],
-    )
-}
-
-#[test]
-fn unary_minus_is_a_literal() {
-    check(
-        r#"
-macro_rules! m { ($x:literal) => (literal!()); ($x:tt) => (not_a_literal!()); }
-m!(92);
-m!(-92);
-m!(-9.2);
-m!(--92);
-"#,
-        expect![[r#"
-macro_rules! m { ($x:literal) => (literal!()); ($x:tt) => (not_a_literal!()); }
-literal!()
-literal!()
-literal!()
-/* error: leftover tokens */not_a_literal!()
-"#]],
-    )
-}
diff --git a/crates/hir_def/src/macro_expansion_tests/mbe.rs b/crates/hir_def/src/macro_expansion_tests/mbe.rs
new file mode 100644
index 00000000000..ae044661f33
--- /dev/null
+++ b/crates/hir_def/src/macro_expansion_tests/mbe.rs
@@ -0,0 +1,137 @@
+use expect_test::expect;
+
+use crate::macro_expansion_tests::check;
+
+#[test]
+fn wrong_nesting_level() {
+    check(
+        r#"
+macro_rules! m {
+    ($($i:ident);*) => ($i)
+}
+m!{a}
+"#,
+        expect![[r#"
+macro_rules! m {
+    ($($i:ident);*) => ($i)
+}
+/* error: expected simple binding, found nested binding `i` */
+"#]],
+    );
+}
+
+#[test]
+fn expansion_does_not_parse_as_expression() {
+    check(
+        r#"
+macro_rules! stmts {
+    () => { let _ = 0; }
+}
+
+fn f() { let _ = stmts!(); }
+"#,
+        expect![[r#"
+macro_rules! stmts {
+    () => { let _ = 0; }
+}
+
+fn f() { let _ = /* error: could not convert tokens */; }
+"#]],
+    )
+}
+
+#[test]
+fn round_trips_compound_tokens() {
+    check(
+        r#"
+macro_rules! m {
+    () => { type qual: ::T = qual::T; }
+}
+m!();
+"#,
+        expect![[r#"
+macro_rules! m {
+    () => { type qual: ::T = qual::T; }
+}
+type qual: ::T = qual::T;
+"#]],
+    )
+}
+
+#[test]
+fn round_trips_literals() {
+    check(
+        r#"
+macro_rules! m {
+    () => {
+        let _ = 'c';
+        let _ = 1000;
+        let _ = 12E+99_f64;
+        let _ = "rust1";
+        let _ = -92;
+    }
+}
+fn f() {
+    m!()
+}
+"#,
+        expect![[r#"
+macro_rules! m {
+    () => {
+        let _ = 'c';
+        let _ = 1000;
+        let _ = 12E+99_f64;
+        let _ = "rust1";
+        let _ = -92;
+    }
+}
+fn f() {
+    let_ = 'c';
+    let_ = 1000;
+    let_ = 12E+99_f64;
+    let_ = "rust1";
+    let_ = -92;
+}
+"#]],
+    );
+}
+
+#[test]
+fn broken_parenthesis_sequence() {
+    check(
+        r#"
+macro_rules! m1 { ($x:ident) => { ($x } }
+macro_rules! m2 { ($x:ident) => {} }
+
+m1!();
+m2!(x
+"#,
+        expect![[r#"
+macro_rules! m1 { ($x:ident) => { ($x } }
+macro_rules! m2 { ($x:ident) => {} }
+
+/* error: Failed to find macro definition */
+/* error: Failed to lower macro args to token tree */
+"#]],
+    )
+}
+
+#[test]
+fn unary_minus_is_a_literal() {
+    check(
+        r#"
+macro_rules! m { ($x:literal) => (literal!()); ($x:tt) => (not_a_literal!()); }
+m!(92);
+m!(-92);
+m!(-9.2);
+m!(--92);
+"#,
+        expect![[r#"
+macro_rules! m { ($x:literal) => (literal!()); ($x:tt) => (not_a_literal!()); }
+literal!()
+literal!()
+literal!()
+/* error: leftover tokens */not_a_literal!()
+"#]],
+    )
+}
diff --git a/crates/mbe/src/lib.rs b/crates/mbe/src/lib.rs
index 8470ea0aaf5..bc407e4171b 100644
--- a/crates/mbe/src/lib.rs
+++ b/crates/mbe/src/lib.rs
@@ -2,6 +2,9 @@
 //! `macro_rules` macros. It uses `TokenTree` (from `tt` package) as the
 //! interface, although it contains some code to bridge `SyntaxNode`s and
 //! `TokenTree`s as well!
+//!
+//! The tes for this functionality live in another crate:
+//! `hir_def::macro_expansion_tests::mbe`.
 
 mod parser;
 mod expander;