diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-11-09 12:28:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-09 12:28:57 +0000 |
| commit | 73b08131dff8855c6736ce41867a6a197dfb87af (patch) | |
| tree | 9ee0820ea9c84dd40c761586cf7efe3ff0f77abc /xtask | |
| parent | 2d3b0571bb02aa85e3aae390e5cfb10b0ada5c38 (diff) | |
| parent | d31ce3b16cbd23950197d8992720b431e19b6af1 (diff) | |
Merge #6506
6506: Cleanup assists r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
Diffstat (limited to 'xtask')
| -rw-r--r-- | xtask/tests/tidy.rs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs index 4c7db8405..99652e76b 100644 --- a/xtask/tests/tidy.rs +++ b/xtask/tests/tidy.rs | |||
| @@ -214,9 +214,6 @@ fn check_todo(path: &Path, text: &str) { | |||
| 214 | // This file itself obviously needs to use todo (<- like this!). | 214 | // This file itself obviously needs to use todo (<- like this!). |
| 215 | "tests/cli.rs", | 215 | "tests/cli.rs", |
| 216 | // Some of our assists generate `todo!()`. | 216 | // Some of our assists generate `todo!()`. |
| 217 | "tests/generated.rs", | ||
| 218 | "handlers/add_custom_impl.rs", | ||
| 219 | "handlers/add_missing_impl_members.rs", | ||
| 220 | "handlers/add_turbo_fish.rs", | 217 | "handlers/add_turbo_fish.rs", |
| 221 | "handlers/generate_function.rs", | 218 | "handlers/generate_function.rs", |
| 222 | // To support generating `todo!()` in assists, we have `expr_todo()` in | 219 | // To support generating `todo!()` in assists, we have `expr_todo()` in |
| @@ -229,6 +226,11 @@ fn check_todo(path: &Path, text: &str) { | |||
| 229 | return; | 226 | return; |
| 230 | } | 227 | } |
| 231 | if text.contains("TODO") || text.contains("TOOD") || text.contains("todo!") { | 228 | if text.contains("TODO") || text.contains("TOOD") || text.contains("todo!") { |
| 229 | // Generated by an assist | ||
| 230 | if text.contains("${0:todo!()}") { | ||
| 231 | return; | ||
| 232 | } | ||
| 233 | |||
| 232 | panic!( | 234 | panic!( |
| 233 | "\nTODO markers or todo! macros should not be committed to the master branch,\n\ | 235 | "\nTODO markers or todo! macros should not be committed to the master branch,\n\ |
| 234 | use FIXME instead\n\ | 236 | use FIXME instead\n\ |