diff --git a/src/alejandra/src/children2.rs b/src/alejandra/src/children2.rs index e3b9994..3b7c3c4 100644 --- a/src/alejandra/src/children2.rs +++ b/src/alejandra/src/children2.rs @@ -2,7 +2,7 @@ use std::collections::LinkedList; pub(crate) enum Trivia { Comment(String), - Newlines(usize), + Newlines, } pub(crate) struct Child { @@ -50,7 +50,7 @@ pub(crate) fn new( } if newlines > 0 { - trivialities.push_back(Trivia::Newlines(newlines)) + trivialities.push_back(Trivia::Newlines) } } }); diff --git a/src/alejandra/src/rules/apply.rs b/src/alejandra/src/rules/apply.rs index 5befb67..7d2997c 100644 --- a/src/alejandra/src/rules/apply.rs +++ b/src/alejandra/src/rules/apply.rs @@ -36,7 +36,7 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::Pad); steps.push_back(crate::builder::Step::Comment(text)); } - crate::children2::Trivia::Newlines(_) => {} + crate::children2::Trivia::Newlines => {} } } diff --git a/src/alejandra/src/rules/bin_op.rs b/src/alejandra/src/rules/bin_op.rs index e0f570b..bff08b7 100644 --- a/src/alejandra/src/rules/bin_op.rs +++ b/src/alejandra/src/rules/bin_op.rs @@ -64,7 +64,7 @@ pub(crate) fn rule_with_configuration( steps.push_back(crate::builder::Step::NewLine); steps.push_back(crate::builder::Step::Pad); } - crate::children2::Trivia::Newlines(_) => {} + crate::children2::Trivia::Newlines => {} } } @@ -91,7 +91,7 @@ pub(crate) fn rule_with_configuration( steps.push_back(crate::builder::Step::NewLine); steps.push_back(crate::builder::Step::Pad); } - crate::children2::Trivia::Newlines(_) => {} + crate::children2::Trivia::Newlines => {} } } } else if !second.has_inline_comment diff --git a/src/alejandra/src/rules/dynamic.rs b/src/alejandra/src/rules/dynamic.rs index cb2c356..e87e8ac 100644 --- a/src/alejandra/src/rules/dynamic.rs +++ b/src/alejandra/src/rules/dynamic.rs @@ -41,7 +41,7 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::NewLine); steps.push_back(crate::builder::Step::Pad); } - crate::children2::Trivia::Newlines(_) => {} + crate::children2::Trivia::Newlines => {} } } @@ -66,7 +66,7 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::Pad); steps.push_back(crate::builder::Step::Comment(text)); } - crate::children2::Trivia::Newlines(_) => {} + crate::children2::Trivia::Newlines => {} } } diff --git a/src/alejandra/src/rules/if_else.rs b/src/alejandra/src/rules/if_else.rs index 50b2996..14ed777 100644 --- a/src/alejandra/src/rules/if_else.rs +++ b/src/alejandra/src/rules/if_else.rs @@ -29,7 +29,7 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::Pad); steps.push_back(crate::builder::Step::Comment(text)); } - crate::children2::Trivia::Newlines(_) => {} + crate::children2::Trivia::Newlines => {} } } steps.push_back(crate::builder::Step::Dedent); @@ -69,7 +69,7 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::NewLine); steps.push_back(crate::builder::Step::Pad); } - crate::children2::Trivia::Newlines(_) => {} + crate::children2::Trivia::Newlines => {} } } @@ -89,7 +89,7 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::Pad); steps.push_back(crate::builder::Step::Comment(text)); } - crate::children2::Trivia::Newlines(_) => {} + crate::children2::Trivia::Newlines => {} } } steps.push_back(crate::builder::Step::Dedent); @@ -135,7 +135,7 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::NewLine); steps.push_back(crate::builder::Step::Pad); } - crate::children2::Trivia::Newlines(_) => {} + crate::children2::Trivia::Newlines => {} } } @@ -155,7 +155,7 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::Pad); steps.push_back(crate::builder::Step::Comment(text)); } - crate::children2::Trivia::Newlines(_) => {} + crate::children2::Trivia::Newlines => {} } } steps.push_back(crate::builder::Step::Dedent); diff --git a/src/alejandra/src/rules/inherit.rs b/src/alejandra/src/rules/inherit.rs index 988c425..ebc3e8f 100644 --- a/src/alejandra/src/rules/inherit.rs +++ b/src/alejandra/src/rules/inherit.rs @@ -39,7 +39,7 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::NewLine); steps.push_back(crate::builder::Step::Pad); } - crate::children2::Trivia::Newlines(_) => {} + crate::children2::Trivia::Newlines => {} } } @@ -54,7 +54,7 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::Comment(text)); steps.push_back(crate::builder::Step::NewLine); // Only add padding if there are no `trivialities` (that is, - // there's no extra `Newlines(_)` to be added) + // there's no extra `Newlines` to be added) // or if the first one is a comment (that is, it'll need // to be indented to match the content). if matches!( @@ -84,12 +84,12 @@ pub(crate) fn rule( // line in the output. if matches!( trivia_iter.peek(), - Some(crate::children2::Trivia::Newlines(_)) + Some(crate::children2::Trivia::Newlines) ) { continue; } } - crate::children2::Trivia::Newlines(_) => {} + crate::children2::Trivia::Newlines => {} } if not_last_child { steps.push_back(crate::builder::Step::NewLine); diff --git a/src/alejandra/src/rules/paren.rs b/src/alejandra/src/rules/paren.rs index 2034113..6f6c1f0 100644 --- a/src/alejandra/src/rules/paren.rs +++ b/src/alejandra/src/rules/paren.rs @@ -69,7 +69,7 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::NewLine); steps.push_back(crate::builder::Step::Pad); } - crate::children2::Trivia::Newlines(_) => {} + crate::children2::Trivia::Newlines => {} } } @@ -92,7 +92,7 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::Pad); steps.push_back(crate::builder::Step::Comment(text)); } - crate::children2::Trivia::Newlines(_) => {} + crate::children2::Trivia::Newlines => {} } } diff --git a/src/alejandra/src/rules/scoped.rs b/src/alejandra/src/rules/scoped.rs index bb3fef1..f9609d2 100644 --- a/src/alejandra/src/rules/scoped.rs +++ b/src/alejandra/src/rules/scoped.rs @@ -43,7 +43,7 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::NewLine); steps.push_back(crate::builder::Step::Pad); } - crate::children2::Trivia::Newlines(_) => {} + crate::children2::Trivia::Newlines => {} } } @@ -71,7 +71,7 @@ pub(crate) fn rule( steps.push_back(crate::builder::Step::Pad); steps.push_back(crate::builder::Step::Comment(text)); } - crate::children2::Trivia::Newlines(_) => {} + crate::children2::Trivia::Newlines => {} } }