Consolidate util and utils (#4328)

Author: ayazhafiz

src/formatting.rs

@@ -57,7 +57,6 @@ mod vertical;
 pub(crate) mod visitor;
 
 pub(crate) mod report;
-pub(crate) mod util;
 
 pub(crate) fn format_input_inner(
     input: Input,

src/formatting/comment.rs

@@ -11,7 +11,7 @@ use crate::formatting::{
     shape::{Indent, Shape},
     string::{rewrite_string, StringFormat},
     utils::{
-        count_newlines, first_line_width, last_line_width, tab_to_spaces,
+        count_newlines, first_line_width, format_code_block, last_line_width, tab_to_spaces,
         trim_end_unless_two_whitespaces, trim_left_preserve_layout, unicode_str_width,
     },
 };
@@ -685,10 +685,7 @@ impl<'a> CommentRewrite<'a> {
                         let mut config = self.fmt.config.clone();
                         config.set().wrap_comments(false);
                         if config.format_code_in_doc_comments() {
-                            if let Some(s) = crate::formatting::util::format_code_block(
-                                &self.code_block_buffer,
-                                &config,
-                            ) {
+                            if let Some(s) = format_code_block(&self.code_block_buffer, &config) {
                                 trim_custom_comment_prefix(s.as_ref())
                             } else {
                                 trim_custom_comment_prefix(&self.code_block_buffer)

src/formatting/macros.rs

@@ -33,11 +33,10 @@ use crate::formatting::{
     shape::{Indent, Shape},
     source_map::SpanUtils,
     spanned::Spanned,
-    util::{format_code_block, format_snippet},
     utils::{
-        count_newlines, format_visibility, indent_next_line, is_empty_line, mk_sp,
-        remove_trailing_white_spaces, rewrite_ident, trim_left_preserve_layout, wrap_str,
-        NodeIdExt,
+        count_newlines, format_code_block, format_snippet, format_visibility, indent_next_line,
+        is_empty_line, mk_sp, remove_trailing_white_spaces, rewrite_ident,
+        trim_left_preserve_layout, wrap_str, NodeIdExt,
     },
     visitor::FmtVisitor,
 };