diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-23 08:07:30 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-03-23 08:07:30 +0000 |
commit | 3d7a330f320ac2ebf73df012556d64be9b120445 (patch) | |
tree | b96c4a3c4f1165fd394ce3a854dbe9e02d370a92 /crates/ra_syntax | |
parent | 15189bc7249fc68a1df0234721514b677a90a305 (diff) | |
parent | 4fd8cfd6adc554752a63aed9ed71d44b372ec4dc (diff) |
Merge #990
990: Forbid TODO markers on master branch r=matklad a=matklad
this makes TODO markers useful for things which you want to fix before sending a PR
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_syntax')
-rw-r--r-- | crates/ra_syntax/src/validation/char.rs | 2 | ||||
-rw-r--r-- | crates/ra_syntax/tests/test.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_syntax/src/validation/char.rs b/crates/ra_syntax/src/validation/char.rs index 3169ed590..c874e5d08 100644 --- a/crates/ra_syntax/src/validation/char.rs +++ b/crates/ra_syntax/src/validation/char.rs | |||
@@ -85,7 +85,7 @@ pub(super) fn is_ascii_escape(code: char) -> bool { | |||
85 | fn validate_ascii_code_escape(text: &str, range: TextRange, errors: &mut Vec<SyntaxError>) { | 85 | fn validate_ascii_code_escape(text: &str, range: TextRange, errors: &mut Vec<SyntaxError>) { |
86 | // An AsciiCodeEscape has 4 chars, example: `\xDD` | 86 | // An AsciiCodeEscape has 4 chars, example: `\xDD` |
87 | if !text.is_ascii() { | 87 | if !text.is_ascii() { |
88 | // TODO: Give a more precise error message (say what the invalid character was) | 88 | // FIXME: Give a more precise error message (say what the invalid character was) |
89 | errors.push(SyntaxError::new(AsciiCodeEscapeOutOfRange, range)); | 89 | errors.push(SyntaxError::new(AsciiCodeEscapeOutOfRange, range)); |
90 | } else if text.chars().count() < 4 { | 90 | } else if text.chars().count() < 4 { |
91 | errors.push(SyntaxError::new(TooShortAsciiCodeEscape, range)); | 91 | errors.push(SyntaxError::new(TooShortAsciiCodeEscape, range)); |
diff --git a/crates/ra_syntax/tests/test.rs b/crates/ra_syntax/tests/test.rs index 537b01368..276756c85 100644 --- a/crates/ra_syntax/tests/test.rs +++ b/crates/ra_syntax/tests/test.rs | |||
@@ -61,7 +61,7 @@ fn reparse_fuzz_tests() { | |||
61 | } | 61 | } |
62 | 62 | ||
63 | /// Test that Rust-analyzer can parse and validate the rust-analyser | 63 | /// Test that Rust-analyzer can parse and validate the rust-analyser |
64 | /// TODO: Use this as a benchmark | 64 | /// FIXME: Use this as a benchmark |
65 | #[test] | 65 | #[test] |
66 | fn self_hosting_parsing() { | 66 | fn self_hosting_parsing() { |
67 | use std::ffi::OsStr; | 67 | use std::ffi::OsStr; |