Apply space_before_type_annotation to struct ctors (#1109)

[rust.git] / src / items.rs

diff --git a/src/items.rs b/src/items.rs
index 65aa7ebe62aaa7398a5eb66dae722486097ab9b9..565abae217cc88a8ed2e41c5f73e0c1192477de6 100644 (file)
--- a/src/items.rs
+++ b/src/items.rs
@@ -16,7 +16,7 @@
             last_line_width, semicolon_for_expr, format_unsafety, trim_newlines};
 use lists::{write_list, itemize_list, ListItem, ListFormatting, SeparatorTactic,
             DefinitiveListTactic, ListTactic, definitive_tactic, format_item_list};
-use expr::{is_empty_block, is_simple_block_stmt, rewrite_assign_rhs};
+use expr::{is_empty_block, is_simple_block_stmt, rewrite_assign_rhs, type_annotation_separator};
 use comment::{FindUncommented, contains_comment};
 use visitor::FmtVisitor;
 use rewrite::{Rewrite, RewriteContext};
@@ -45,11 +45,7 @@ fn rewrite(&self, context: &RewriteContext, width: usize, offset: Indent) -> Opt
             let mut infix = String::new();
 
             if let Some(ref ty) = self.ty {
-                let separator = if context.config.space_before_type_annotation {
-                    " : "
-                } else {
-                    ": "
-                };
+                let separator = type_annotation_separator(context.config);
                 let indent = offset + last_line_width(&result) + separator.len();
                 // 1 = ;
                 let budget = try_opt!(width.checked_sub(indent.width() + 1));