Lints and suggestions for the Nix programming language
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

refactor(empty_inherit): let-else and try-expression

+21 -15
+21 -15
lib/src/lints/empty_inherit.rs
··· 29 29 30 30 impl Rule for EmptyInherit { 31 31 fn validate(&self, node: &SyntaxElement, _sess: &SessionInfo) -> Option<Report> { 32 - if let NodeOrToken::Node(node) = node 33 - && let Some(inherit_stmt) = Inherit::cast(node.clone()) 34 - && inherit_stmt.from().is_none() 35 - && inherit_stmt.idents().count() == 0 36 - { 37 - let at = node.text_range(); 38 - let replacement = make::empty().node().clone(); 39 - let replacement_at = utils::with_preceeding_whitespace(node); 40 - let message = "Remove this empty `inherit` statement"; 41 - Some( 42 - self.report() 43 - .suggest(at, message, Suggestion::new(replacement_at, replacement)), 44 - ) 45 - } else { 46 - None 32 + let NodeOrToken::Node(node) = node else { 33 + return None; 34 + }; 35 + 36 + let inherit_stmt = Inherit::cast(node.clone())?; 37 + 38 + if inherit_stmt.from().is_some() { 39 + return None; 47 40 } 41 + 42 + if inherit_stmt.idents().count() != 0 { 43 + return None; 44 + } 45 + 46 + let at = node.text_range(); 47 + let replacement = make::empty().node().clone(); 48 + let replacement_at = utils::with_preceeding_whitespace(node); 49 + let message = "Remove this empty `inherit` statement"; 50 + Some( 51 + self.report() 52 + .suggest(at, message, Suggestion::new(replacement_at, replacement)), 53 + ) 48 54 } 49 55 }