1 files changed, 5 insertions, 144 deletions
diff --git a/crates/hir_def/src/body/tests.rs b/crates/hir_def/src/body/tests.rs
index d4fae05a6..27d837d47 100644
--- a/crates/hir_def/src/body/tests.rs
+++ b/crates/hir_def/src/body/tests.rs
@@ -3,7 +3,7 @@ mod block;
 use base_db::{fixture::WithFixture, SourceDatabase};
 use expect_test::Expect;
-use crate::{test_db::TestDB, ModuleDefId};
+use crate::ModuleDefId;
 use super::*;
@@ -28,11 +28,6 @@ fn lower(ra_fixture: &str) -> Arc<Body> {
    db.body(fn_def.unwrap().into())
 }
-fn check_diagnostics(ra_fixture: &str) {
-    let db: TestDB = TestDB::with_files(ra_fixture);
-    db.check_diagnostics();
-}
 fn block_def_map_at(ra_fixture: &str) -> String {
    let (db, position) = crate::test_db::TestDB::with_position(ra_fixture);
@@ -57,7 +52,7 @@ fn check_at(ra_fixture: &str, expect: Expect) {
 fn your_stack_belongs_to_me() {
    cov_mark::check!(your_stack_belongs_to_me);
    lower(
-        "
+        r#"
 macro_rules! n_nuple {
    ($e:tt) => ();
    ($($rest:tt)*) => {{
@@ -65,7 +60,7 @@ macro_rules! n_nuple {
    }};
 }
 fn main() { n_nuple!(1,2,3); }
-",
+"#,
    );
 }
@@ -73,7 +68,7 @@ fn main() { n_nuple!(1,2,3); }
 fn macro_resolve() {
    // Regression test for a path resolution bug introduced with inner item handling.
    lower(
-        r"
+        r#"
 macro_rules! vec {
    () => { () };
    ($elem:expr; $n:expr) => { () };
@@ -84,140 +79,6 @@ mod m {
        let _ = vec![FileSet::default(); self.len()];
    }
 }
-      ",
+"#,
-    );
-}
-#[test]
-fn cfg_diagnostics() {
-    check_diagnostics(
-        r"
-fn f() {
-    // The three g̶e̶n̶d̶e̶r̶s̶ statements:
-    #[cfg(a)] fn f() {}  // Item statement
-  //^^^^^^^^^^^^^^^^^^^ InactiveCode
-    #[cfg(a)] {}         // Expression statement
-  //^^^^^^^^^^^^ InactiveCode
-    #[cfg(a)] let x = 0; // let statement
-  //^^^^^^^^^^^^^^^^^^^^ InactiveCode
-    abc(#[cfg(a)] 0);
-      //^^^^^^^^^^^ InactiveCode
-    let x = Struct {
-        #[cfg(a)] f: 0,
-      //^^^^^^^^^^^^^^ InactiveCode
-    };
-    match () {
-        () => (),
-        #[cfg(a)] () => (),
-      //^^^^^^^^^^^^^^^^^^ InactiveCode
-    }
-    #[cfg(a)] 0          // Trailing expression of block
-  //^^^^^^^^^^^ InactiveCode
-}
-    ",
-    );
-}
-#[test]
-fn macro_diag_builtin() {
-    check_diagnostics(
-        r#"
-#[rustc_builtin_macro]
-macro_rules! env {}
-#[rustc_builtin_macro]
-macro_rules! include {}
-#[rustc_builtin_macro]
-macro_rules! compile_error {}
-#[rustc_builtin_macro]
-macro_rules! format_args {
-    () => {}
-}
-fn f() {
-    // Test a handful of built-in (eager) macros:
-    include!(invalid);
-  //^^^^^^^^^^^^^^^^^ could not convert tokens
-    include!("does not exist");
-  //^^^^^^^^^^^^^^^^^^^^^^^^^^ failed to load file `does not exist`
-    env!(invalid);
-  //^^^^^^^^^^^^^ could not convert tokens
-    env!("OUT_DIR");
-  //^^^^^^^^^^^^^^^ `OUT_DIR` not set, enable "run build scripts" to fix
-    compile_error!("compile_error works");
-  //^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ compile_error works
-    // Lazy:
-    format_args!();
-  //^^^^^^^^^^^^^^ no rule matches input tokens
-}
-        "#,
-    );
-}
-#[test]
-fn macro_rules_diag() {
-    check_diagnostics(
-        r#"
-macro_rules! m {
-    () => {};
-}
-fn f() {
-    m!();
-    m!(hi);
-  //^^^^^^ leftover tokens
-}
-      "#,
    );
 }
-#[test]
-fn unresolved_macro_diag() {
-    check_diagnostics(
-        r#"
-fn f() {
-    m!();
-  //^^^^ UnresolvedMacroCall
-}
-      "#,
-    );
-}
-#[test]
-fn dollar_crate_in_builtin_macro() {
-    check_diagnostics(
-        r#"
-#[macro_export]
-#[rustc_builtin_macro]
-macro_rules! format_args {}
-#[macro_export]
-macro_rules! arg {
-    () => {}
-}
-#[macro_export]
-macro_rules! outer {
-    () => {
-        $crate::format_args!( "", $crate::arg!(1) )
-    };
-}
-fn f() {
-    outer!();
-  //^^^^^^^^ leftover tokens
-}
-        "#,
-    )
-}

diff --git a/crates/hir_def/src/body/tests.rs b/crates/hir_def/src/body/tests.rs index d4fae05a6..27d837d47 100644 --- a/crates/hir_def/src/body/tests.rs +++ b/crates/hir_def/src/body/tests.rs
@@ -3,7 +3,7 @@ mod block;
3	use base_db::{fixture::WithFixture, SourceDatabase};	3	use base_db::{fixture::WithFixture, SourceDatabase};
4	use expect_test::Expect;	4	use expect_test::Expect;
5		5
6	use crate::{test_db::TestDB, ModuleDefId};	6	use crate::ModuleDefId;
7		7
8	use super::*;	8	use super::*;
9		9
@@ -28,11 +28,6 @@ fn lower(ra_fixture: &str) -> Arc<Body> {
28	db.body(fn_def.unwrap().into())	28	db.body(fn_def.unwrap().into())
29	}	29	}
30		30
31	fn check_diagnostics(ra_fixture: &str) {
32	let db: TestDB = TestDB::with_files(ra_fixture);
33	db.check_diagnostics();
34	}
35
36	fn block_def_map_at(ra_fixture: &str) -> String {	31	fn block_def_map_at(ra_fixture: &str) -> String {
37	let (db, position) = crate::test_db::TestDB::with_position(ra_fixture);	32	let (db, position) = crate::test_db::TestDB::with_position(ra_fixture);
38		33
@@ -57,7 +52,7 @@ fn check_at(ra_fixture: &str, expect: Expect) {
57	fn your_stack_belongs_to_me() {	52	fn your_stack_belongs_to_me() {
58	cov_mark::check!(your_stack_belongs_to_me);	53	cov_mark::check!(your_stack_belongs_to_me);
59	lower(	54	lower(
60	"	55	r#"
61	macro_rules! n_nuple {	56	macro_rules! n_nuple {
62	($e:tt) => ();	57	($e:tt) => ();
63	($($rest:tt)*) => {{	58	($($rest:tt)*) => {{
@@ -65,7 +60,7 @@ macro_rules! n_nuple {
65	}};	60	}};
66	}	61	}
67	fn main() { n_nuple!(1,2,3); }	62	fn main() { n_nuple!(1,2,3); }
68	",	63	"#,
69	);	64	);
70	}	65	}
71		66
@@ -73,7 +68,7 @@ fn main() { n_nuple!(1,2,3); }
73	fn macro_resolve() {	68	fn macro_resolve() {
74	// Regression test for a path resolution bug introduced with inner item handling.	69	// Regression test for a path resolution bug introduced with inner item handling.
75	lower(	70	lower(
76	r"	71	r#"
77	macro_rules! vec {	72	macro_rules! vec {
78	() => { () };	73	() => { () };
79	($elem:expr; $n:expr) => { () };	74	($elem:expr; $n:expr) => { () };
@@ -84,140 +79,6 @@ mod m {
84	let _ = vec![FileSet::default(); self.len()];	79	let _ = vec![FileSet::default(); self.len()];
85	}	80	}
86	}	81	}
87	",	82	"#,
88	);
89	}
90
91	#[test]
92	fn cfg_diagnostics() {
93	check_diagnostics(
94	r"
95	fn f() {
96	// The three g̶e̶n̶d̶e̶r̶s̶ statements:
97
98	#[cfg(a)] fn f() {} // Item statement
99	//^^^^^^^^^^^^^^^^^^^ InactiveCode
100	#[cfg(a)] {} // Expression statement
101	//^^^^^^^^^^^^ InactiveCode
102	#[cfg(a)] let x = 0; // let statement
103	//^^^^^^^^^^^^^^^^^^^^ InactiveCode
104
105	abc(#[cfg(a)] 0);
106	//^^^^^^^^^^^ InactiveCode
107	let x = Struct {
108	#[cfg(a)] f: 0,
109	//^^^^^^^^^^^^^^ InactiveCode
110	};
111	match () {
112	() => (),
113	#[cfg(a)] () => (),
114	//^^^^^^^^^^^^^^^^^^ InactiveCode
115	}
116
117	#[cfg(a)] 0 // Trailing expression of block
118	//^^^^^^^^^^^ InactiveCode
119	}
120	",
121	);
122	}
123
124	#[test]
125	fn macro_diag_builtin() {
126	check_diagnostics(
127	r#"
128	#[rustc_builtin_macro]
129	macro_rules! env {}
130
131	#[rustc_builtin_macro]
132	macro_rules! include {}
133
134	#[rustc_builtin_macro]
135	macro_rules! compile_error {}
136
137	#[rustc_builtin_macro]
138	macro_rules! format_args {
139	() => {}
140	}
141
142	fn f() {
143	// Test a handful of built-in (eager) macros:
144
145	include!(invalid);
146	//^^^^^^^^^^^^^^^^^ could not convert tokens
147	include!("does not exist");
148	//^^^^^^^^^^^^^^^^^^^^^^^^^^ failed to load file `does not exist`
149
150	env!(invalid);
151	//^^^^^^^^^^^^^ could not convert tokens
152
153	env!("OUT_DIR");
154	//^^^^^^^^^^^^^^^ `OUT_DIR` not set, enable "run build scripts" to fix
155
156	compile_error!("compile_error works");
157	//^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ compile_error works
158
159	// Lazy:
160
161	format_args!();
162	//^^^^^^^^^^^^^^ no rule matches input tokens
163	}
164	"#,
165	);
166	}
167
168	#[test]
169	fn macro_rules_diag() {
170	check_diagnostics(
171	r#"
172	macro_rules! m {
173	() => {};
174	}
175	fn f() {
176	m!();
177
178	m!(hi);
179	//^^^^^^ leftover tokens
180	}
181	"#,
182	);	83	);
183	}	84	}
184
185	#[test]
186	fn unresolved_macro_diag() {
187	check_diagnostics(
188	r#"
189	fn f() {
190	m!();
191	//^^^^ UnresolvedMacroCall
192	}
193	"#,
194	);
195	}
196
197	#[test]
198	fn dollar_crate_in_builtin_macro() {
199	check_diagnostics(
200	r#"
201	#[macro_export]
202	#[rustc_builtin_macro]
203	macro_rules! format_args {}
204
205	#[macro_export]
206	macro_rules! arg {
207	() => {}
208	}
209
210	#[macro_export]
211	macro_rules! outer {
212	() => {
213	$crate::format_args!( "", $crate::arg!(1) )
214	};
215	}
216
217	fn f() {
218	outer!();
219	//^^^^^^^^ leftover tokens
220	}
221	"#,
222	)
223	}