From 3783de4b34f6366accb2277a3155399b9e339d90 Mon Sep 17 00:00:00 2001 From: max Date: Mon, 8 Jan 2024 22:49:40 +0200 Subject: [PATCH] Rename `ParentIdent` to `ParentIndent` Signed-off-by: max --- formatter/src/collect.rs | 4 ++-- formatter/src/formatter/mac.rs | 10 +++++----- formatter/src/formatter/mod.rs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/formatter/src/collect.rs b/formatter/src/collect.rs index 7f5495e..15ffa6f 100644 --- a/formatter/src/collect.rs +++ b/formatter/src/collect.rs @@ -5,7 +5,7 @@ use syn::{ File, Macro, }; -use crate::{ParentIdent, ViewMacro}; +use crate::{ParentIndent, ViewMacro}; struct ViewMacroVisitor<'ast> { macros: Vec>, @@ -26,7 +26,7 @@ impl<'ast> Visit<'ast> for ViewMacroVisitor<'ast> { let tabs = indent_chars.iter().filter(|&&c| c == '\t').count(); let spaces = indent_chars.iter().filter(|&&c| c == ' ').count(); - if let Some(view_mac) = ViewMacro::try_parse(ParentIdent { tabs, spaces }, node) { + if let Some(view_mac) = ViewMacro::try_parse(ParentIndent { tabs, spaces }, node) { self.macros.push(view_mac); } } diff --git a/formatter/src/formatter/mac.rs b/formatter/src/formatter/mac.rs index 84cfaa7..5afd1fd 100644 --- a/formatter/src/formatter/mac.rs +++ b/formatter/src/formatter/mac.rs @@ -7,7 +7,7 @@ use syn::{spanned::Spanned, Macro}; use super::{Formatter, FormatterSettings}; pub struct ViewMacro<'a> { - pub parent_ident: ParentIdent, + pub parent_indent: ParentIndent, pub cx: Option, pub global_class: Option, pub nodes: Vec, @@ -17,13 +17,13 @@ pub struct ViewMacro<'a> { } #[derive(Default)] -pub struct ParentIdent { +pub struct ParentIndent { pub tabs: usize, pub spaces: usize, } impl<'a> ViewMacro<'a> { - pub fn try_parse(parent_ident: ParentIdent, mac: &'a Macro) -> Option { + pub fn try_parse(parent_indent: ParentIndent, mac: &'a Macro) -> Option { let mut tokens = mac.tokens.clone().into_iter(); let (cx, comma) = (tokens.next(), tokens.next()); @@ -56,7 +56,7 @@ impl<'a> ViewMacro<'a> { let nodes = rstml::parse2(tokens).ok()?; Some(Self { - parent_ident, + parent_indent, global_class, nodes, span, @@ -74,7 +74,7 @@ impl<'a> ViewMacro<'a> { impl Formatter<'_> { pub fn view_macro(&mut self, view_mac: &ViewMacro) { let ViewMacro { - parent_ident: parent_indent, + parent_indent, cx, global_class, nodes, diff --git a/formatter/src/formatter/mod.rs b/formatter/src/formatter/mod.rs index 1289f26..e3a058d 100644 --- a/formatter/src/formatter/mod.rs +++ b/formatter/src/formatter/mod.rs @@ -12,7 +12,7 @@ mod mac; mod node; pub use mac::format_macro; -pub use mac::{ParentIdent, ViewMacro}; +pub use mac::{ParentIndent, ViewMacro}; use serde::Deserialize; use serde::Serialize;