Fix a typo
This commit is contained in:
parent
a2d57e956a
commit
78826e6783
4 changed files with 9 additions and 7 deletions
|
@ -24,7 +24,7 @@ use lists::{write_list, itemize_list, ListFormatting, SeparatorTactic, ListTacti
|
|||
use string::{StringFormat, rewrite_string};
|
||||
use utils::{extra_offset, last_line_width, wrap_str, binary_search, first_line_width,
|
||||
semicolon_for_stmt, trimmed_last_line_width, left_most_sub_expr, stmt_expr,
|
||||
place_spaces};
|
||||
colon_spaces};
|
||||
use visitor::FmtVisitor;
|
||||
use config::{Config, IndentStyle, MultilineStyle, ControlBraceStyle};
|
||||
use comment::{FindUncommented, rewrite_comment, contains_comment, recover_comment_removed};
|
||||
|
@ -1891,8 +1891,9 @@ fn rewrite_struct_lit<'a>(context: &RewriteContext,
|
|||
// of space, we should fall back to BlockIndent.
|
||||
}
|
||||
|
||||
pub fn type_annotation_separator(config: &Config) -> & str {
|
||||
place_spaces (config.space_before_type_annotation, config.space_after_type_annotation_colon)
|
||||
pub fn type_annotation_separator(config: &Config) -> &str {
|
||||
colon_spaces(config.space_before_type_annotation,
|
||||
config.space_after_type_annotation_colon)
|
||||
}
|
||||
|
||||
fn rewrite_field(context: &RewriteContext, field: &ast::Field, shape: Shape) -> Option<String> {
|
||||
|
|
|
@ -207,7 +207,7 @@ pub fn write_list<I, T>(items: I, formatting: &ListFormatting) -> Option<String>
|
|||
let item_sep_len = if separate { sep_len } else { 0 };
|
||||
|
||||
// Item string may be multi-line. Its length (used for block comment alignment)
|
||||
// Should be only the length of the last line.
|
||||
// should be only the length of the last line.
|
||||
let item_last_line = if item.is_multiline() {
|
||||
inner_item.lines().last().unwrap_or("")
|
||||
} else {
|
||||
|
|
|
@ -21,7 +21,7 @@ use {Shape, Spanned};
|
|||
use codemap::SpanUtils;
|
||||
use lists::{format_item_list, itemize_list, format_fn_args};
|
||||
use rewrite::{Rewrite, RewriteContext};
|
||||
use utils::{extra_offset, format_mutability, place_spaces, wrap_str};
|
||||
use utils::{extra_offset, format_mutability, colon_spaces, wrap_str};
|
||||
use expr::{rewrite_unary_prefix, rewrite_pair, rewrite_tuple};
|
||||
use config::TypeDensity;
|
||||
use itertools::Itertools;
|
||||
|
@ -346,7 +346,8 @@ fn format_function_type<'a, I>(inputs: I,
|
|||
}
|
||||
|
||||
fn type_bound_colon(context: &RewriteContext) -> &'static str {
|
||||
place_spaces(context.config.space_before_bound, context.config.space_after_bound_colon)
|
||||
colon_spaces(context.config.space_before_bound,
|
||||
context.config.space_after_bound_colon)
|
||||
}
|
||||
|
||||
impl Rewrite for ast::WherePredicate {
|
||||
|
|
|
@ -327,7 +327,7 @@ pub fn binary_search<C, T>(mut lo: usize, mut hi: usize, callback: C) -> Option<
|
|||
}
|
||||
|
||||
#[inline]
|
||||
pub fn place_spaces(before: bool, after: bool) -> &'static str {
|
||||
pub fn colon_spaces(before: bool, after: bool) -> &'static str {
|
||||
match (before, after) {
|
||||
(true, true) => " : ",
|
||||
(true, false) => " :",
|
||||
|
|
Loading…
Reference in a new issue