From 3c9a675b9d776bf2210803d582e9af88f9df2631 Mon Sep 17 00:00:00 2001 From: Akshay Date: Thu, 28 Oct 2021 07:50:36 +0530 Subject: fix fp with manual_inherit and manual_inherit_from the lint also needed to validate if the length of the path component was exactly one, and not just check if the first component matches the value. --- lib/src/lints/manual_inherit.rs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'lib/src/lints/manual_inherit.rs') diff --git a/lib/src/lints/manual_inherit.rs b/lib/src/lints/manual_inherit.rs index 69f032b..0a6933c 100644 --- a/lib/src/lints/manual_inherit.rs +++ b/lib/src/lints/manual_inherit.rs @@ -3,7 +3,7 @@ use crate::{make, Lint, Metadata, Report, Rule, Suggestion}; use if_chain::if_chain; use macros::lint; use rnix::{ - types::{KeyValue, Ident, TypedNode, TokenWrapper}, + types::{Ident, KeyValue, TokenWrapper, TypedNode}, NodeOrToken, SyntaxElement, SyntaxKind, }; @@ -20,8 +20,10 @@ impl Rule for ManualInherit { if_chain! { if let NodeOrToken::Node(node) = node; if let Some(key_value_stmt) = KeyValue::cast(node.clone()); - if let Some(key_path) = key_value_stmt.key(); - if let Some(key_node) = key_path.path().next(); + if let mut key_path = key_value_stmt.key()?.path(); + if let Some(key_node) = key_path.next(); + // ensure that path has exactly one component + if key_path.next().is_none(); if let Some(key) = Ident::cast(key_node); if let Some(value_node) = key_value_stmt.value(); @@ -40,4 +42,3 @@ impl Rule for ManualInherit { } } } - -- cgit v1.2.3