refactor(xatu): remove unused AST node wrappers

src/xatu/ast.rs

@@ -28,15 +28,7 @@ impl std::fmt::Display for SourceRange {
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum NodeData {
-    Apply(Apply),
     Binding(Binding),
-    LetIn(LetIn),
-    Inherit(Inherit),
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Apply {
-    pub function: Expr,
 }
 
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -45,33 +37,11 @@ pub struct Binding {
     pub value: Ident,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum Expr {
-    Ident(Ident),
-    Select(Box<Select>),
-}
-
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Ident {
     pub name: String,
 }
 
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Select {
-    pub receiver: Expr,
-    pub attrs: Vec<Ident>,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct LetIn {
-    pub binding_count: usize,
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct Inherit {
-    pub attr_count: usize,
-}
-
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct Token {
     pub range: SourceRange,

src/xatu/parser.rs

@@ -1,4 +1,4 @@
-use rnix::ast::{Attr, HasEntry};
+use rnix::ast::Attr;
 use rowan::ast::AstNode;
 
 use crate::{FileId, ast};
@@ -37,35 +37,11 @@ fn convert_syntax(syntax: rnix::SyntaxNode) -> (Vec<ast::Node>, Vec<ast::Token>)
 
 fn convert_node(node: rnix::SyntaxNode) -> Option<ast::Node> {
     match node.kind() {
-        rnix::SyntaxKind::NODE_APPLY => convert_apply(node),
         rnix::SyntaxKind::NODE_ATTRPATH_VALUE => convert_binding(node),
-        rnix::SyntaxKind::NODE_LET_IN => convert_let_in(node),
-        rnix::SyntaxKind::NODE_INHERIT => convert_inherit(node),
         _ => None,
     }
 }
 
-fn convert_apply(node: rnix::SyntaxNode) -> Option<ast::Node> {
-    let apply = rnix::ast::Apply::cast(node)?;
-    let range = apply.syntax().text_range().into();
-    let data = apply.try_into().ok()?;
-
-    Some(ast::Node {
-        range,
-        data: ast::NodeData::Apply(data),
-    })
-}
-
-impl TryFrom<rnix::ast::Apply> for ast::Apply {
-    type Error = ();
-
-    fn try_from(apply: rnix::ast::Apply) -> Result<Self, Self::Error> {
-        Ok(Self {
-            function: apply.lambda().ok_or(())?.try_into()?,
-        })
-    }
-}
-
 fn convert_binding(node: rnix::SyntaxNode) -> Option<ast::Node> {
     let binding = rnix::ast::AttrpathValue::cast(node)?;
     let range = binding.syntax().text_range().into();
@@ -100,18 +76,6 @@ impl TryFrom<rnix::ast::AttrpathValue> for ast::Binding {
     }
 }
 
-impl TryFrom<rnix::ast::Expr> for ast::Expr {
-    type Error = ();
-
-    fn try_from(expr: rnix::ast::Expr) -> Result<Self, Self::Error> {
-        match expr {
-            rnix::ast::Expr::Ident(ident) => Ok(Self::Ident(ident.into())),
-            rnix::ast::Expr::Select(select) => Ok(Self::Select(Box::new(select.try_into()?))),
-            _ => Err(()),
-        }
-    }
-}
-
 impl From<rnix::ast::Ident> for ast::Ident {
     fn from(ident: rnix::ast::Ident) -> Self {
         Self {
@@ -120,63 +84,6 @@ impl From<rnix::ast::Ident> for ast::Ident {
     }
 }
 
-impl TryFrom<rnix::ast::Select> for ast::Select {
-    type Error = ();
-
-    fn try_from(select: rnix::ast::Select) -> Result<Self, Self::Error> {
-        Ok(Self {
-            receiver: select.expr().ok_or(())?.try_into()?,
-            attrs: select
-                .attrpath()
-                .ok_or(())?
-                .attrs()
-                .map(|attr| match attr {
-                    rnix::ast::Attr::Ident(ident) => Ok(ident.into()),
-                    _ => Err(()),
-                })
-                .collect::<Result<Vec<_>, _>>()?,
-        })
-    }
-}
-
-fn convert_let_in(node: rnix::SyntaxNode) -> Option<ast::Node> {
-    let let_in = rnix::ast::LetIn::cast(node)?;
-
-    Some(ast::Node {
-        range: let_in.syntax().text_range().into(),
-        data: ast::NodeData::LetIn(let_in.into()),
-    })
-}
-
-impl From<rnix::ast::LetIn> for ast::LetIn {
-    fn from(let_in: rnix::ast::LetIn) -> Self {
-        Self {
-            binding_count: let_in.attrpath_values().count()
-                + let_in
-                    .inherits()
-                    .map(|inherit| inherit.attrs().count())
-                    .sum::<usize>(),
-        }
-    }
-}
-
-fn convert_inherit(node: rnix::SyntaxNode) -> Option<ast::Node> {
-    let inherit = rnix::ast::Inherit::cast(node)?;
-
-    Some(ast::Node {
-        range: inherit.syntax().text_range().into(),
-        data: ast::NodeData::Inherit(inherit.into()),
-    })
-}
-
-impl From<rnix::ast::Inherit> for ast::Inherit {
-    fn from(inherit: rnix::ast::Inherit) -> Self {
-        Self {
-            attr_count: inherit.attrs().count(),
-        }
-    }
-}
-
 fn convert_token(token: rnix::SyntaxToken) -> Option<ast::Token> {
     match token.kind() {
         rnix::SyntaxKind::TOKEN_URI => Some(ast::Token {

src/xatu/rules/manual_inherit.rs

@@ -8,10 +8,9 @@ impl NodeRule for ManualInherit {
     const ID: &'static str = "manual_inherit";
 
     fn select(data: &ast::NodeData) -> Option<&Self::Node> {
-        match data {
+        let ast::NodeData::Binding(binding) = data;
-            ast::NodeData::Binding(binding) => Some(binding),
+
-            _ => None,
+        Some(binding)
-        }
     }
 
     fn check(node: &Self::Node) -> Option<&'static str> {