aboutsummaryrefslogtreecommitdiff
path: root/xtask/tests/tidy.rs
diff options
context:
space:
mode:
Diffstat (limited to 'xtask/tests/tidy.rs')
-rw-r--r--xtask/tests/tidy.rs8
1 files changed, 6 insertions, 2 deletions
diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs
index 9de60c76c..4c58aed59 100644
--- a/xtask/tests/tidy.rs
+++ b/xtask/tests/tidy.rs
@@ -168,6 +168,7 @@ ISC
168MIT 168MIT
169MIT / Apache-2.0 169MIT / Apache-2.0
170MIT OR Apache-2.0 170MIT OR Apache-2.0
171MIT OR Apache-2.0 OR Zlib
171MIT OR Zlib OR Apache-2.0 172MIT OR Zlib OR Apache-2.0
172MIT/Apache-2.0 173MIT/Apache-2.0
173Unlicense OR MIT 174Unlicense OR MIT
@@ -214,8 +215,6 @@ fn check_todo(path: &Path, text: &str) {
214 // This file itself obviously needs to use todo (<- like this!). 215 // This file itself obviously needs to use todo (<- like this!).
215 "tests/cli.rs", 216 "tests/cli.rs",
216 // Some of our assists generate `todo!()`. 217 // Some of our assists generate `todo!()`.
217 "tests/generated.rs",
218 "handlers/add_missing_impl_members.rs",
219 "handlers/add_turbo_fish.rs", 218 "handlers/add_turbo_fish.rs",
220 "handlers/generate_function.rs", 219 "handlers/generate_function.rs",
221 // To support generating `todo!()` in assists, we have `expr_todo()` in 220 // To support generating `todo!()` in assists, we have `expr_todo()` in
@@ -228,6 +227,11 @@ fn check_todo(path: &Path, text: &str) {
228 return; 227 return;
229 } 228 }
230 if text.contains("TODO") || text.contains("TOOD") || text.contains("todo!") { 229 if text.contains("TODO") || text.contains("TOOD") || text.contains("todo!") {
230 // Generated by an assist
231 if text.contains("${0:todo!()}") {
232 return;
233 }
234
231 panic!( 235 panic!(
232 "\nTODO markers or todo! macros should not be committed to the master branch,\n\ 236 "\nTODO markers or todo! macros should not be committed to the master branch,\n\
233 use FIXME instead\n\ 237 use FIXME instead\n\