From aa4cd311bb07ea25d89096e8fdd5d64b73666c28 Mon Sep 17 00:00:00 2001 From: est31 Date: Tue, 6 Jun 2017 03:11:17 +0200 Subject: Add config options for spaces around the colon in struct literal fields In Rust, colons are used for three purposes: * Type annotations, including type ascription * Trait bounds * Struct literal fields This commit adds options for the last missing of the three purposes, struct literal fields. --- src/expr.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/expr.rs') diff --git a/src/expr.rs b/src/expr.rs index 16dfe6fcaa6..8392ab438cd 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -2050,18 +2050,18 @@ fn rewrite_struct_lit<'a>(context: &RewriteContext, // FIXME if context.config.struct_lit_style() == Visual, but we run out // of space, we should fall back to BlockIndent. } - -pub fn type_annotation_separator(config: &Config) -> &str { - colon_spaces(config.space_before_type_annotation(), - config.space_after_type_annotation_colon()) +pub fn struct_lit_field_separator(config: &Config) -> &str { + colon_spaces(config.space_before_struct_lit_field_colon(), + config.space_after_struct_lit_field_colon()) } + fn rewrite_field(context: &RewriteContext, field: &ast::Field, shape: Shape) -> Option { let name = &field.ident.node.to_string(); if field.is_shorthand { Some(name.to_string()) } else { - let separator = type_annotation_separator(context.config); + let separator = struct_lit_field_separator(context.config); let overhead = name.len() + separator.len(); let mut expr_shape = try_opt!(shape.sub_width(overhead)); expr_shape.offset += overhead; -- cgit 1.4.1-3-g733a5