Remove unused imports, variables and functions

Author: topecongiro

src/closures.rs

@@ -3,7 +3,7 @@ use syntax::{ast, ptr};
 
 use crate::attr::get_attrs_from_stmt;
 use crate::config::lists::*;
-use crate::config::{IndentStyle, SeparatorTactic, Version};
+use crate::config::{IndentStyle, SeparatorTactic};
 use crate::expr::{block_contains_comment, is_simple_block, is_unsafe_block, rewrite_cond};
 use crate::items::{span_hi_for_param, span_lo_for_param};
 use crate::lists::{definitive_tactic, itemize_list, write_list, ListFormatting, Separator};

src/expr.rs

@@ -13,7 +13,7 @@ use crate::comment::{
     rewrite_comment, rewrite_missing_comment, CharClasses, FindUncommented,
 };
 use crate::config::lists::*;
-use crate::config::{Config, ControlBraceStyle, IndentStyle, Version};
+use crate::config::{Config, ControlBraceStyle, IndentStyle};
 use crate::lists::{
     definitive_tactic, itemize_list, shape_for_tactic, struct_lit_formatting, struct_lit_shape,
     struct_lit_tactic, write_list, ListFormatting, Separator,

src/items.rs

@@ -16,7 +16,7 @@ use crate::comment::{
     FindUncommented,
 };
 use crate::config::lists::*;
-use crate::config::{BraceStyle, Config, IndentStyle, Version};
+use crate::config::{BraceStyle, Config, IndentStyle};
 use crate::expr::{
     is_empty_block, is_simple_block_stmt, rewrite_assign_rhs, rewrite_assign_rhs_expr,
     rewrite_assign_rhs_with, RhsTactics,
@@ -2678,20 +2678,6 @@ fn rewrite_generics(
     overflow::rewrite_with_angle_brackets(context, ident, params, shape, generics.span)
 }
 
-fn generics_shape_from_config(config: &Config, shape: Shape, offset: usize) -> Option<Shape> {
-    match config.indent_style() {
-        IndentStyle::Visual => shape.visual_indent(1 + offset).sub_width(offset + 2),
-        IndentStyle::Block => {
-            // 1 = ","
-            shape
-                .block()
-                .block_indent(config.tab_spaces())
-                .with_max_width(config)
-                .sub_width(1)
-        }
-    }
-}
-
 fn rewrite_where_clause_rfc_style(
     context: &RewriteContext<'_>,
     where_clause: &ast::WhereClause,

src/lib.rs

@@ -328,7 +328,7 @@ fn format_code_block(code_snippet: &str, config: &Config) -> Option<FormattedSni
             }
             result.push_str(&line);
             result.push('\n');
-            need_indent = indent_next_line(kind, &line, config);
+            need_indent = indent_next_line(kind);
         }
         result.push('}');
         result
@@ -389,7 +389,7 @@ fn format_code_block(code_snippet: &str, config: &Config) -> Option<FormattedSni
             line
         };
         result.push_str(trimmed_line);
-        is_indented = indent_next_line(kind, line, config);
+        is_indented = indent_next_line(kind);
     }
     Some(FormattedSnippet {
         snippet: result,

src/macros.rs

@@ -1390,7 +1390,7 @@ impl MacroBranch {
                     {
                         s += &indent_str;
                     }
-                    (s + l + "\n", indent_next_line(kind, &l, &config))
+                    (s + l + "\n", indent_next_line(kind))
                 },
             )
             .0;

src/matches.rs

@@ -7,7 +7,7 @@ use syntax::{ast, ptr};
 
 use crate::comment::{combine_strs_with_missing_comments, rewrite_comment};
 use crate::config::lists::*;
-use crate::config::{Config, ControlBraceStyle, IndentStyle, Version};
+use crate::config::{Config, ControlBraceStyle, IndentStyle};
 use crate::expr::{
     format_expr, is_empty_block, is_simple_block, is_unsafe_block, prefer_next_line, rewrite_cond,
     ExprType, RhsTactics,

src/overflow.rs

@@ -9,7 +9,6 @@ use syntax::{ast, ptr};
 
 use crate::closures;
 use crate::config::lists::*;
-use crate::config::Version;
 use crate::expr::{
     can_be_overflowed_expr, is_every_expr_simple, is_method_call, is_nested_call, is_simple_expr,
     rewrite_cond,

src/stmt.rs

@@ -2,7 +2,6 @@ use syntax::ast;
 use syntax_pos::Span;
 
 use crate::comment::recover_comment_removed;
-use crate::config::Version;
 use crate::expr::{format_expr, ExprType};
 use crate::rewrite::{Rewrite, RewriteContext};
 use crate::shape::Shape;

src/types.rs

@@ -6,7 +6,7 @@ use syntax::source_map::{BytePos, Span, DUMMY_SP};
 use syntax::symbol::kw;
 
 use crate::config::lists::*;
-use crate::config::{IndentStyle, TypeDensity, Version};
+use crate::config::{IndentStyle, TypeDensity};
 use crate::expr::{format_expr, rewrite_assign_rhs, rewrite_tuple, rewrite_unary_prefix, ExprType};
 use crate::lists::{
     definitive_tactic, itemize_list, write_list, ListFormatting, ListItem, Separator,

src/utils.rs

@@ -12,7 +12,7 @@ use syntax_pos::ExpnId;
 use unicode_width::UnicodeWidthStr;
 
 use crate::comment::{filter_normal_code, CharClasses, FullCodeCharKind, LineClasses};
-use crate::config::{Config, Version};
+use crate::config::Config;
 use crate::rewrite::RewriteContext;
 use crate::shape::{Indent, Shape};
 
@@ -617,7 +617,7 @@ pub(crate) fn trim_left_preserve_layout(
 
 /// Based on the given line, determine if the next line can be indented or not.
 /// This allows to preserve the indentation of multi-line literals.
-pub(crate) fn indent_next_line(kind: FullCodeCharKind, _line: &str, config: &Config) -> bool {
+pub(crate) fn indent_next_line(kind: FullCodeCharKind) -> bool {
     !(kind.is_string() || kind.is_commented_string())
 }
 

src/visitor.rs

@@ -238,8 +238,6 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
 
         let mut last_hi = span.lo();
         let mut unindented = false;
-        let mut prev_ends_with_newline = false;
-        let mut extra_newline = false;
 
         let skip_normal = |s: &str| {
             let trimmed = s.trim();
@@ -270,7 +268,7 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
                     let mut comment_on_same_line = !snippet_in_between.contains("\n")
                         && !last_line_contains_single_line_comment(&self.buffer);
 
-                    let mut comment_shape =
+                    let comment_shape =
                         Shape::indented(self.block_indent, config).comment(config);
                     if self.config.version() == Version::Two && comment_on_same_line {
                         self.push_str(" ");
@@ -312,16 +310,13 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
                     }
                 }
                 CodeCharKind::Normal if skip_normal(&sub_slice) => {
-                    extra_newline = prev_ends_with_newline && sub_slice.contains('\n');
                     continue;
                 }
                 CodeCharKind::Normal => {
                     self.push_str(&self.block_indent.to_string_with_newline(config));
                     self.push_str(sub_slice.trim());
                 }
             }
-            prev_ends_with_newline = sub_slice.ends_with('\n');
-            extra_newline = false;
             last_hi = span.lo() + BytePos::from_usize(offset + sub_slice.len());
         }
         if unindented {