diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2021-06-03 13:09:10 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2021-06-03 13:09:10 +0100 |
commit | 48ea50bf04a1bd12999bd9e27558ac31988c7228 (patch) | |
tree | 64b223398a3b62b8cc4e86239495a5b3e446441a /crates/syntax | |
parent | c7eb19ebf9d42cada8cb532c6b3cb0e11a531b93 (diff) | |
parent | a1e650082b068919f9515330e6d0977c09af190f (diff) |
Merge #9124
9124: Apply a few clippy suggestions r=lnicola a=clemenswasser
Co-authored-by: Clemens Wasser <[email protected]>
Diffstat (limited to 'crates/syntax')
-rw-r--r-- | crates/syntax/src/parsing/reparsing.rs | 8 | ||||
-rw-r--r-- | crates/syntax/src/tests.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/crates/syntax/src/parsing/reparsing.rs b/crates/syntax/src/parsing/reparsing.rs index 4ad50ab72..304f47b3d 100644 --- a/crates/syntax/src/parsing/reparsing.rs +++ b/crates/syntax/src/parsing/reparsing.rs | |||
@@ -36,8 +36,8 @@ pub(crate) fn incremental_reparse( | |||
36 | None | 36 | None |
37 | } | 37 | } |
38 | 38 | ||
39 | fn reparse_token<'node>( | 39 | fn reparse_token( |
40 | root: &'node SyntaxNode, | 40 | root: &SyntaxNode, |
41 | edit: &Indel, | 41 | edit: &Indel, |
42 | ) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> { | 42 | ) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> { |
43 | let prev_token = root.covering_element(edit.delete).as_token()?.clone(); | 43 | let prev_token = root.covering_element(edit.delete).as_token()?.clone(); |
@@ -84,8 +84,8 @@ fn reparse_token<'node>( | |||
84 | } | 84 | } |
85 | } | 85 | } |
86 | 86 | ||
87 | fn reparse_block<'node>( | 87 | fn reparse_block( |
88 | root: &'node SyntaxNode, | 88 | root: &SyntaxNode, |
89 | edit: &Indel, | 89 | edit: &Indel, |
90 | ) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> { | 90 | ) -> Option<(GreenNode, Vec<SyntaxError>, TextRange)> { |
91 | let (node, reparser) = find_reparsable_node(root, edit.delete)?; | 91 | let (node, reparser) = find_reparsable_node(root, edit.delete)?; |
diff --git a/crates/syntax/src/tests.rs b/crates/syntax/src/tests.rs index 45f3c800f..9f2426171 100644 --- a/crates/syntax/src/tests.rs +++ b/crates/syntax/src/tests.rs | |||
@@ -236,7 +236,7 @@ where | |||
236 | } | 236 | } |
237 | }); | 237 | }); |
238 | dir_tests(&test_data_dir(), err_paths, "rast", |text, path| { | 238 | dir_tests(&test_data_dir(), err_paths, "rast", |text, path| { |
239 | if let Ok(_) = f(text) { | 239 | if f(text).is_ok() { |
240 | panic!("'{:?}' successfully parsed when it should have errored", path); | 240 | panic!("'{:?}' successfully parsed when it should have errored", path); |
241 | } else { | 241 | } else { |
242 | "ERROR\n".to_owned() | 242 | "ERROR\n".to_owned() |