From 5c3d7ab8b7a7aca4708a70c895603529ec9d4c4d Mon Sep 17 00:00:00 2001
From: Kevin Amado <kamadorueda@gmail.com>
Date: Fri, 25 Feb 2022 22:53:18 -0500
Subject: [PATCH] refactor: mark as pub(crate)

---
 src/alejandra_engine/src/builder.rs           | 10 ++---
 src/alejandra_engine/src/children.rs          |  7 ++--
 src/alejandra_engine/src/lib.rs               | 12 +++---
 src/alejandra_engine/src/parsers/if_else.rs   |  4 +-
 src/alejandra_engine/src/parsers/mod.rs       |  4 +-
 src/alejandra_engine/src/parsers/pattern.rs   |  6 +--
 src/alejandra_engine/src/position.rs          |  2 +-
 src/alejandra_engine/src/rules/apply.rs       |  2 +-
 .../src/rules/assert_and_with.rs              |  2 +-
 src/alejandra_engine/src/rules/attr_set.rs    |  2 +-
 .../src/rules/bin_op_and_or_default.rs        |  4 +-
 src/alejandra_engine/src/rules/dynamic.rs     |  2 +-
 src/alejandra_engine/src/rules/if_else.rs     |  2 +-
 src/alejandra_engine/src/rules/inherit.rs     |  2 +-
 src/alejandra_engine/src/rules/key_value.rs   |  2 +-
 src/alejandra_engine/src/rules/lambda.rs      |  2 +-
 src/alejandra_engine/src/rules/let_in.rs      |  2 +-
 src/alejandra_engine/src/rules/list.rs        |  2 +-
 src/alejandra_engine/src/rules/mod.rs         | 40 +++++++++----------
 src/alejandra_engine/src/rules/paren.rs       |  2 +-
 src/alejandra_engine/src/rules/pat_bind.rs    |  2 +-
 src/alejandra_engine/src/rules/pat_entry.rs   |  2 +-
 src/alejandra_engine/src/rules/pattern.rs     |  2 +-
 src/alejandra_engine/src/rules/root.rs        |  2 +-
 src/alejandra_engine/src/rules/select.rs      |  2 +-
 src/alejandra_engine/src/rules/string.rs      |  2 +-
 .../src/rules/string_interpol.rs              |  2 +-
 src/alejandra_engine/src/utils.rs             |  4 +-
 28 files changed, 65 insertions(+), 64 deletions(-)

diff --git a/src/alejandra_engine/src/builder.rs b/src/alejandra_engine/src/builder.rs
index c0dd102..8d211d2 100644
--- a/src/alejandra_engine/src/builder.rs
+++ b/src/alejandra_engine/src/builder.rs
@@ -1,5 +1,5 @@
 #[derive(PartialEq)]
-pub enum Step {
+pub(crate) enum Step {
     Comment(String),
     Dedent,
     Format(rnix::SyntaxElement),
@@ -12,7 +12,7 @@ pub enum Step {
 }
 
 #[derive(Clone)]
-pub struct BuildCtx {
+pub(crate) struct BuildCtx {
     pub force_wide:  bool,
     pub indentation: usize,
     pub pos_new:     crate::position::Position,
@@ -40,7 +40,7 @@ impl BuildCtx {
     }
 }
 
-pub fn build(
+pub(crate) fn build(
     element: rnix::SyntaxElement,
     force_wide: bool,
     path: String,
@@ -286,7 +286,7 @@ fn format_wider(
     };
 }
 
-pub fn fits_in_single_line(
+pub(crate) fn fits_in_single_line(
     build_ctx: &crate::builder::BuildCtx,
     element: rnix::SyntaxElement,
 ) -> bool {
@@ -299,7 +299,7 @@ pub fn fits_in_single_line(
     }
 }
 
-pub fn make_isolated_token(
+pub(crate) fn make_isolated_token(
     kind: rnix::SyntaxKind,
     text: &str,
 ) -> rnix::SyntaxToken {
diff --git a/src/alejandra_engine/src/children.rs b/src/alejandra_engine/src/children.rs
index 6bb3791..6436d2d 100644
--- a/src/alejandra_engine/src/children.rs
+++ b/src/alejandra_engine/src/children.rs
@@ -1,15 +1,16 @@
 #[derive(Clone)]
-pub struct Child {
+pub(crate) struct Child {
     pub element: rnix::SyntaxElement,
+    #[allow(dead_code)]
     pub pos:     crate::position::Position,
 }
 
-pub struct Children {
+pub(crate) struct Children {
     children:      Vec<Child>,
     current_index: usize,
 }
 
-pub enum Trivia {
+pub(crate) enum Trivia {
     Comment(String),
     Whitespace(String),
 }
diff --git a/src/alejandra_engine/src/lib.rs b/src/alejandra_engine/src/lib.rs
index 69a27c2..d77ba86 100644
--- a/src/alejandra_engine/src/lib.rs
+++ b/src/alejandra_engine/src/lib.rs
@@ -1,8 +1,8 @@
-pub mod builder;
-pub mod children;
+pub(crate) mod builder;
+pub(crate) mod children;
 pub mod format;
-pub mod parsers;
-pub mod position;
-pub mod rules;
-pub mod utils;
+pub(crate) mod parsers;
+pub(crate) mod position;
+pub(crate) mod rules;
+pub(crate) mod utils;
 pub mod version;
diff --git a/src/alejandra_engine/src/parsers/if_else.rs b/src/alejandra_engine/src/parsers/if_else.rs
index 4e75b08..94a9d5d 100644
--- a/src/alejandra_engine/src/parsers/if_else.rs
+++ b/src/alejandra_engine/src/parsers/if_else.rs
@@ -1,7 +1,7 @@
 use std::collections::LinkedList;
 
 #[derive(Debug, Default)]
-pub struct IfElse {
+pub(crate) struct IfElse {
     pub comments_before_if_expr:   LinkedList<String>,
     pub if_expr:                   Option<rnix::SyntaxElement>,
     pub comments_after_if_expr:    LinkedList<String>,
@@ -12,7 +12,7 @@ pub struct IfElse {
     pub else_expr:                 Option<rnix::SyntaxElement>,
 }
 
-pub fn parse(
+pub(crate) fn parse(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> IfElse {
diff --git a/src/alejandra_engine/src/parsers/mod.rs b/src/alejandra_engine/src/parsers/mod.rs
index 9e72ce3..4b25b4a 100644
--- a/src/alejandra_engine/src/parsers/mod.rs
+++ b/src/alejandra_engine/src/parsers/mod.rs
@@ -1,2 +1,2 @@
-pub mod if_else;
-pub mod pattern;
+pub(crate) mod if_else;
+pub(crate) mod pattern;
diff --git a/src/alejandra_engine/src/parsers/pattern.rs b/src/alejandra_engine/src/parsers/pattern.rs
index dac8390..9dc90fc 100644
--- a/src/alejandra_engine/src/parsers/pattern.rs
+++ b/src/alejandra_engine/src/parsers/pattern.rs
@@ -1,14 +1,14 @@
 use std::collections::LinkedList;
 
 #[derive(Debug, Default)]
-pub struct Argument {
+pub(crate) struct Argument {
     pub comments_before: LinkedList<String>,
     pub item:            Option<rnix::SyntaxElement>,
     pub comment_after:   Option<String>,
 }
 
 #[derive(Debug, Default)]
-pub struct Pattern {
+pub(crate) struct Pattern {
     pub initial_at:                    Option<rnix::SyntaxElement>,
     pub comments_after_initial_at:     LinkedList<String>,
     pub arguments:                     LinkedList<Argument>,
@@ -17,7 +17,7 @@ pub struct Pattern {
     pub end_at:                        Option<rnix::SyntaxElement>,
 }
 
-pub fn parse(
+pub(crate) fn parse(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> Pattern {
diff --git a/src/alejandra_engine/src/position.rs b/src/alejandra_engine/src/position.rs
index 6012d64..d760b58 100644
--- a/src/alejandra_engine/src/position.rs
+++ b/src/alejandra_engine/src/position.rs
@@ -1,5 +1,5 @@
 #[derive(Clone, Debug)]
-pub struct Position {
+pub(crate) struct Position {
     pub column: usize,
     pub line:   usize,
 }
diff --git a/src/alejandra_engine/src/rules/apply.rs b/src/alejandra_engine/src/rules/apply.rs
index a60e2a0..ee6c828 100644
--- a/src/alejandra_engine/src/rules/apply.rs
+++ b/src/alejandra_engine/src/rules/apply.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/assert_and_with.rs b/src/alejandra_engine/src/rules/assert_and_with.rs
index 4e5b766..d785ddb 100644
--- a/src/alejandra_engine/src/rules/assert_and_with.rs
+++ b/src/alejandra_engine/src/rules/assert_and_with.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/attr_set.rs b/src/alejandra_engine/src/rules/attr_set.rs
index 478ef55..168ff13 100644
--- a/src/alejandra_engine/src/rules/attr_set.rs
+++ b/src/alejandra_engine/src/rules/attr_set.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/bin_op_and_or_default.rs b/src/alejandra_engine/src/rules/bin_op_and_or_default.rs
index f422e88..dd7d862 100644
--- a/src/alejandra_engine/src/rules/bin_op_and_or_default.rs
+++ b/src/alejandra_engine/src/rules/bin_op_and_or_default.rs
@@ -1,11 +1,11 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
     rule_with_configuration(build_ctx, node, "bin_op_and_or_default")
 }
 
-pub fn rule_with_configuration(
+pub(crate) fn rule_with_configuration(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
     parent_kind: &str,
diff --git a/src/alejandra_engine/src/rules/dynamic.rs b/src/alejandra_engine/src/rules/dynamic.rs
index 8f256bc..6ba204a 100644
--- a/src/alejandra_engine/src/rules/dynamic.rs
+++ b/src/alejandra_engine/src/rules/dynamic.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/if_else.rs b/src/alejandra_engine/src/rules/if_else.rs
index 87ac36c..6fa83dc 100644
--- a/src/alejandra_engine/src/rules/if_else.rs
+++ b/src/alejandra_engine/src/rules/if_else.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/inherit.rs b/src/alejandra_engine/src/rules/inherit.rs
index d3dffa6..254fa57 100644
--- a/src/alejandra_engine/src/rules/inherit.rs
+++ b/src/alejandra_engine/src/rules/inherit.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/key_value.rs b/src/alejandra_engine/src/rules/key_value.rs
index 1efc180..8cd5f27 100644
--- a/src/alejandra_engine/src/rules/key_value.rs
+++ b/src/alejandra_engine/src/rules/key_value.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/lambda.rs b/src/alejandra_engine/src/rules/lambda.rs
index 011003c..43bb98b 100644
--- a/src/alejandra_engine/src/rules/lambda.rs
+++ b/src/alejandra_engine/src/rules/lambda.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/let_in.rs b/src/alejandra_engine/src/rules/let_in.rs
index f736404..6bfe35b 100644
--- a/src/alejandra_engine/src/rules/let_in.rs
+++ b/src/alejandra_engine/src/rules/let_in.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/list.rs b/src/alejandra_engine/src/rules/list.rs
index e9aefcc..dc49248 100644
--- a/src/alejandra_engine/src/rules/list.rs
+++ b/src/alejandra_engine/src/rules/list.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/mod.rs b/src/alejandra_engine/src/rules/mod.rs
index 13ff330..9d3c836 100644
--- a/src/alejandra_engine/src/rules/mod.rs
+++ b/src/alejandra_engine/src/rules/mod.rs
@@ -1,24 +1,24 @@
-pub mod apply;
-pub mod assert_and_with;
-pub mod attr_set;
-pub mod bin_op_and_or_default;
-pub mod dynamic;
-pub mod if_else;
-pub mod inherit;
-pub mod key_value;
-pub mod lambda;
-pub mod let_in;
-pub mod list;
-pub mod paren;
-pub mod pat_bind;
-pub mod pat_entry;
-pub mod pattern;
-pub mod root;
-pub mod select;
-pub mod string;
-pub mod string_interpol;
+pub(crate) mod apply;
+pub(crate) mod assert_and_with;
+pub(crate) mod attr_set;
+pub(crate) mod bin_op_and_or_default;
+pub(crate) mod dynamic;
+pub(crate) mod if_else;
+pub(crate) mod inherit;
+pub(crate) mod key_value;
+pub(crate) mod lambda;
+pub(crate) mod let_in;
+pub(crate) mod list;
+pub(crate) mod paren;
+pub(crate) mod pat_bind;
+pub(crate) mod pat_entry;
+pub(crate) mod pattern;
+pub(crate) mod root;
+pub(crate) mod select;
+pub(crate) mod string;
+pub(crate) mod string_interpol;
 
-pub fn default(
+pub(crate) fn default(
     _: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/paren.rs b/src/alejandra_engine/src/rules/paren.rs
index 1a6e866..b87274e 100644
--- a/src/alejandra_engine/src/rules/paren.rs
+++ b/src/alejandra_engine/src/rules/paren.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/pat_bind.rs b/src/alejandra_engine/src/rules/pat_bind.rs
index dc52710..8fea13a 100644
--- a/src/alejandra_engine/src/rules/pat_bind.rs
+++ b/src/alejandra_engine/src/rules/pat_bind.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/pat_entry.rs b/src/alejandra_engine/src/rules/pat_entry.rs
index 1c850a6..2b91625 100644
--- a/src/alejandra_engine/src/rules/pat_entry.rs
+++ b/src/alejandra_engine/src/rules/pat_entry.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/pattern.rs b/src/alejandra_engine/src/rules/pattern.rs
index 2b721c1..768b190 100644
--- a/src/alejandra_engine/src/rules/pattern.rs
+++ b/src/alejandra_engine/src/rules/pattern.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/root.rs b/src/alejandra_engine/src/rules/root.rs
index 1b5ac0c..71d2286 100644
--- a/src/alejandra_engine/src/rules/root.rs
+++ b/src/alejandra_engine/src/rules/root.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/select.rs b/src/alejandra_engine/src/rules/select.rs
index d706d67..581a77f 100644
--- a/src/alejandra_engine/src/rules/select.rs
+++ b/src/alejandra_engine/src/rules/select.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/string.rs b/src/alejandra_engine/src/rules/string.rs
index 5b85f6c..09de468 100644
--- a/src/alejandra_engine/src/rules/string.rs
+++ b/src/alejandra_engine/src/rules/string.rs
@@ -4,7 +4,7 @@ const PLACEHOLDER: &str = "\
     6b219abc9462c41b87e47344752e9940\
     abf9353565f69a5db5c672b89372b84c";
 
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/rules/string_interpol.rs b/src/alejandra_engine/src/rules/string_interpol.rs
index 8f256bc..6ba204a 100644
--- a/src/alejandra_engine/src/rules/string_interpol.rs
+++ b/src/alejandra_engine/src/rules/string_interpol.rs
@@ -1,4 +1,4 @@
-pub fn rule(
+pub(crate) fn rule(
     build_ctx: &crate::builder::BuildCtx,
     node: &rnix::SyntaxNode,
 ) -> std::collections::LinkedList<crate::builder::Step> {
diff --git a/src/alejandra_engine/src/utils.rs b/src/alejandra_engine/src/utils.rs
index d833162..ecd2208 100644
--- a/src/alejandra_engine/src/utils.rs
+++ b/src/alejandra_engine/src/utils.rs
@@ -1,7 +1,7 @@
-pub fn has_newlines(string: &str) -> bool {
+pub(crate) fn has_newlines(string: &str) -> bool {
     string.chars().any(|c| c == '\n')
 }
 
-pub fn count_newlines(string: &str) -> usize {
+pub(crate) fn count_newlines(string: &str) -> usize {
     string.chars().filter(|c| *c == '\n').count()
 }