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.

2 files changed, 10 insertions, 10 deletions

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 {
         }
     }
 }
-
diff --git a/lib/src/lints/manual_inherit_from.rs b/lib/src/lints/manual_inherit_from.rs
index 2bff5f8..355ed8a 100644
--- a/lib/src/lints/manual_inherit_from.rs
+++ b/lib/src/lints/manual_inherit_from.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, Select, TypedNode, TokenWrapper},
+    types::{Ident, KeyValue, Select, TokenWrapper, TypedNode},
     NodeOrToken, SyntaxElement, SyntaxKind,
 };
 
@@ -20,8 +20,9 @@ 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();
+            if key_path.next().is_none();
             if let Some(key) = Ident::cast(key_node);
 
             if let Some(value_node) = key_value_stmt.value();
@@ -35,7 +36,7 @@ impl Rule for ManualInherit {
                 let at = node.text_range();
                 let replacement = {
                     let set = value.set()?;
-                    make::inherit_from_stmt(set, &[key]).node().clone() 
+                    make::inherit_from_stmt(set, &[key]).node().clone()
                 };
                 let message = "This assignment is better written with `inherit`";
                 Some(Self::report().suggest(at, message, Suggestion::new(at, replacement)))
@@ -45,5 +46,3 @@ impl Rule for ManualInherit {
         }
     }
 }
-
-