diff options
| author | Caleb Cartwright <caleb.cartwright@outlook.com> | 2022-07-03 22:09:42 -0500 |
|---|---|---|
| committer | Yacin Tmimi <yacintmimi@gmail.com> | 2022-07-05 08:51:36 -0400 |
| commit | 35f4c55bf476884feadf525e110453f6815f8dd8 (patch) | |
| tree | a4fddca3e706b6f3add2e1a9409d5731400bc4e7 /src/expr.rs | |
| parent | 2ae63f0018a7e18deb7ac0063379c2350a631fca (diff) | |
refactor: remove some unnecessary clones
Diffstat (limited to 'src/expr.rs')
| -rw-r--r-- | src/expr.rs | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/expr.rs b/src/expr.rs index e4cc93026f1..13d068d0c2d 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -29,9 +29,9 @@ use crate::spanned::Spanned; use crate::string::{rewrite_string, StringFormat}; use crate::types::{rewrite_path, PathContext}; use crate::utils::{ - colon_spaces, contains_skip, count_newlines, first_line_ends_with, inner_attributes, - last_line_extendable, last_line_width, mk_sp, outer_attributes, semicolon_for_expr, - unicode_str_width, wrap_str, + colon_spaces, contains_skip, count_newlines, filtered_str_fits, first_line_ends_with, + inner_attributes, last_line_extendable, last_line_width, mk_sp, outer_attributes, + semicolon_for_expr, unicode_str_width, wrap_str, }; use crate::vertical::rewrite_with_alignment; use crate::visitor::FmtVisitor; @@ -2037,8 +2037,7 @@ fn choose_rhs<R: Rewrite>( match (orig_rhs, new_rhs) { (Some(ref orig_rhs), Some(ref new_rhs)) - if wrap_str(new_rhs.clone(), context.config.max_width(), new_shape) - .is_none() => + if !filtered_str_fits(&new_rhs, context.config.max_width(), new_shape) => { Some(format!("{}{}", before_space_str, orig_rhs)) } |
