2015-04-20 23:47:15 -05:00
|
|
|
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
|
|
|
// file at the top-level directory of this distribution and at
|
|
|
|
// http://rust-lang.org/COPYRIGHT.
|
|
|
|
//
|
|
|
|
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
|
|
|
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
|
|
|
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
|
|
|
// option. This file may not be copied, modified, or distributed
|
|
|
|
// except according to those terms.
|
|
|
|
|
2015-05-24 18:03:26 -05:00
|
|
|
// Formatting top-level items - functions, structs, enums, traits, impls.
|
|
|
|
|
2017-07-20 17:17:49 -05:00
|
|
|
use std::cmp::min;
|
|
|
|
|
2017-07-13 04:42:14 -05:00
|
|
|
use syntax::{abi, ast, ptr, symbol};
|
|
|
|
use syntax::ast::ImplItem;
|
|
|
|
use syntax::codemap::{BytePos, Span};
|
|
|
|
|
2017-07-10 00:35:50 -05:00
|
|
|
use {Indent, Shape, Spanned};
|
2017-07-28 22:51:45 -05:00
|
|
|
use codemap::{LineRangeUtils, SpanUtils};
|
2017-08-11 03:52:49 -05:00
|
|
|
use comment::{combine_strs_with_missing_comments, contains_comment, recover_comment_removed,
|
2017-08-27 10:13:42 -05:00
|
|
|
recover_missing_comment_in_span, rewrite_missing_comment, FindUncommented};
|
2017-07-13 04:42:14 -05:00
|
|
|
use config::{BraceStyle, Config, Density, IndentStyle, ReturnIndent, Style};
|
2017-06-24 05:46:36 -05:00
|
|
|
use expr::{format_expr, is_empty_block, is_simple_block_stmt, rewrite_assign_rhs,
|
|
|
|
rewrite_call_inner, ExprType};
|
2017-07-13 04:42:14 -05:00
|
|
|
use lists::{definitive_tactic, itemize_list, write_list, DefinitiveListTactic, ListFormatting,
|
2017-08-18 09:19:47 -05:00
|
|
|
ListItem, ListTactic, Separator, SeparatorPlace, SeparatorTactic};
|
2015-09-08 13:56:33 -05:00
|
|
|
use rewrite::{Rewrite, RewriteContext};
|
2017-06-11 09:26:49 -05:00
|
|
|
use types::join_bounds;
|
2017-08-01 08:23:12 -05:00
|
|
|
use utils::{colon_spaces, contains_skip, end_typaram, first_line_width, format_abi,
|
|
|
|
format_constness, format_defaultness, format_mutability, format_unsafety,
|
2017-08-11 03:52:49 -05:00
|
|
|
format_visibility, is_attributes_extendable, last_line_contains_single_line_comment,
|
|
|
|
last_line_used_width, last_line_width, mk_sp, semicolon_for_expr, stmt_expr,
|
|
|
|
trim_newlines, trimmed_last_line_width, wrap_str};
|
2017-07-03 04:54:41 -05:00
|
|
|
use vertical::rewrite_with_alignment;
|
2017-07-13 04:42:14 -05:00
|
|
|
use visitor::FmtVisitor;
|
2015-04-20 23:47:15 -05:00
|
|
|
|
2017-06-05 20:11:17 -05:00
|
|
|
fn type_annotation_separator(config: &Config) -> &str {
|
2017-06-11 22:58:58 -05:00
|
|
|
colon_spaces(
|
|
|
|
config.space_before_type_annotation(),
|
|
|
|
config.space_after_type_annotation_colon(),
|
|
|
|
)
|
2017-06-05 20:11:17 -05:00
|
|
|
}
|
|
|
|
|
2015-10-24 05:19:58 -05:00
|
|
|
// Statements of the form
|
|
|
|
// let pat: ty = init;
|
|
|
|
impl Rewrite for ast::Local {
|
2017-01-30 13:28:48 -06:00
|
|
|
fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
|
2017-06-11 22:58:58 -05:00
|
|
|
debug!(
|
|
|
|
"Local::rewrite {:?} {} {:?}",
|
|
|
|
self,
|
|
|
|
shape.width,
|
|
|
|
shape.indent
|
|
|
|
);
|
2017-07-28 22:51:45 -05:00
|
|
|
|
|
|
|
skip_out_of_file_lines_range!(context, self.span);
|
|
|
|
|
2017-08-30 05:27:36 -05:00
|
|
|
if contains_skip(&self.attrs) {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
|
|
|
|
let attrs_str = try_opt!(self.attrs.rewrite(context, shape));
|
|
|
|
let mut result = if attrs_str.is_empty() {
|
|
|
|
"let ".to_owned()
|
|
|
|
} else {
|
|
|
|
try_opt!(combine_strs_with_missing_comments(
|
|
|
|
context,
|
|
|
|
&attrs_str,
|
|
|
|
"let ",
|
2017-08-30 21:11:52 -05:00
|
|
|
mk_sp(
|
|
|
|
self.attrs.last().map(|a| a.span.hi()).unwrap(),
|
|
|
|
self.span.lo(),
|
|
|
|
),
|
2017-08-30 05:27:36 -05:00
|
|
|
shape,
|
|
|
|
false,
|
|
|
|
))
|
|
|
|
};
|
2015-10-24 05:19:58 -05:00
|
|
|
|
2017-04-19 08:48:45 -05:00
|
|
|
// 4 = "let ".len()
|
|
|
|
let pat_shape = try_opt!(shape.offset_left(4));
|
2017-03-20 17:23:59 -05:00
|
|
|
// 1 = ;
|
|
|
|
let pat_shape = try_opt!(pat_shape.sub_width(1));
|
2017-08-29 08:16:04 -05:00
|
|
|
let pat_str = try_opt!(self.pat.rewrite(context, pat_shape));
|
2015-10-24 05:19:58 -05:00
|
|
|
result.push_str(&pat_str);
|
|
|
|
|
|
|
|
// String that is placed within the assignment pattern and expression.
|
|
|
|
let infix = {
|
2017-08-27 10:24:10 -05:00
|
|
|
let mut infix = String::with_capacity(32);
|
2015-10-24 05:19:58 -05:00
|
|
|
|
|
|
|
if let Some(ref ty) = self.ty {
|
2016-08-03 23:17:47 -05:00
|
|
|
let separator = type_annotation_separator(context.config);
|
2017-01-30 13:28:48 -06:00
|
|
|
let indent = shape.indent + last_line_width(&result) + separator.len();
|
2015-10-24 05:19:58 -05:00
|
|
|
// 1 = ;
|
2017-01-30 13:28:48 -06:00
|
|
|
let budget = try_opt!(shape.width.checked_sub(indent.width() + 1));
|
|
|
|
let rewrite = try_opt!(ty.rewrite(context, Shape::legacy(budget, indent)));
|
2015-10-24 05:19:58 -05:00
|
|
|
|
2016-08-02 20:07:56 -05:00
|
|
|
infix.push_str(separator);
|
2015-10-24 05:19:58 -05:00
|
|
|
infix.push_str(&rewrite);
|
2015-08-21 06:31:09 -05:00
|
|
|
}
|
|
|
|
|
2015-10-24 05:19:58 -05:00
|
|
|
if self.init.is_some() {
|
|
|
|
infix.push_str(" =");
|
2015-08-21 06:31:09 -05:00
|
|
|
}
|
2015-10-24 05:19:58 -05:00
|
|
|
|
|
|
|
infix
|
2015-08-21 06:31:09 -05:00
|
|
|
};
|
|
|
|
|
2015-10-24 05:19:58 -05:00
|
|
|
result.push_str(&infix);
|
|
|
|
|
|
|
|
if let Some(ref ex) = self.init {
|
2017-01-26 14:14:26 -06:00
|
|
|
// 1 = trailing semicolon;
|
2017-03-20 17:23:59 -05:00
|
|
|
let nested_shape = try_opt!(shape.sub_width(1));
|
2015-10-24 05:19:58 -05:00
|
|
|
|
2017-08-29 08:16:04 -05:00
|
|
|
result = try_opt!(rewrite_assign_rhs(context, result, ex, nested_shape));
|
2015-10-24 05:19:58 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
result.push(';');
|
|
|
|
Some(result)
|
2015-08-21 06:31:09 -05:00
|
|
|
}
|
2015-10-24 05:19:58 -05:00
|
|
|
}
|
2015-08-21 06:31:09 -05:00
|
|
|
|
2017-01-12 19:07:42 -06:00
|
|
|
// TODO convert to using rewrite style rather than visitor
|
|
|
|
// TODO format modules in this style
|
2017-01-26 12:42:34 -06:00
|
|
|
#[allow(dead_code)]
|
2017-01-12 19:07:42 -06:00
|
|
|
struct Item<'a> {
|
|
|
|
keyword: &'static str,
|
|
|
|
abi: String,
|
|
|
|
vis: Option<&'a ast::Visibility>,
|
|
|
|
body: Vec<BodyElement<'a>>,
|
|
|
|
span: Span,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl<'a> Item<'a> {
|
|
|
|
fn from_foreign_mod(fm: &'a ast::ForeignMod, span: Span, config: &Config) -> Item<'a> {
|
2017-05-16 03:47:09 -05:00
|
|
|
let abi = if fm.abi == abi::Abi::C && !config.force_explicit_abi() {
|
2017-01-12 19:07:42 -06:00
|
|
|
"extern".into()
|
|
|
|
} else {
|
|
|
|
format!("extern {}", fm.abi)
|
|
|
|
};
|
|
|
|
Item {
|
|
|
|
keyword: "",
|
|
|
|
abi: abi,
|
|
|
|
vis: None,
|
2017-03-06 14:40:08 -06:00
|
|
|
body: fm.items
|
|
|
|
.iter()
|
|
|
|
.map(|i| BodyElement::ForeignItem(i))
|
|
|
|
.collect(),
|
2017-01-12 19:07:42 -06:00
|
|
|
span: span,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
enum BodyElement<'a> {
|
|
|
|
// Stmt(&'a ast::Stmt),
|
|
|
|
// Field(&'a ast::Field),
|
|
|
|
// Variant(&'a ast::Variant),
|
|
|
|
// Item(&'a ast::Item),
|
|
|
|
ForeignItem(&'a ast::ForeignItem),
|
|
|
|
}
|
|
|
|
|
2015-10-24 05:19:58 -05:00
|
|
|
impl<'a> FmtVisitor<'a> {
|
2017-01-12 19:07:42 -06:00
|
|
|
fn format_item(&mut self, item: Item) {
|
|
|
|
self.buffer.push_str(&item.abi);
|
|
|
|
self.buffer.push_str(" ");
|
2015-09-21 13:02:45 -05:00
|
|
|
|
2017-01-12 19:07:42 -06:00
|
|
|
let snippet = self.snippet(item.span);
|
2016-03-14 00:55:55 -05:00
|
|
|
let brace_pos = snippet.find_uncommented("{").unwrap();
|
|
|
|
|
2016-08-23 07:00:43 -05:00
|
|
|
self.buffer.push_str("{");
|
2017-01-12 19:07:42 -06:00
|
|
|
if !item.body.is_empty() || contains_comment(&snippet[brace_pos..]) {
|
2016-03-14 00:55:55 -05:00
|
|
|
// FIXME: this skips comments between the extern keyword and the opening
|
|
|
|
// brace.
|
2017-08-19 13:47:40 -05:00
|
|
|
self.last_pos = item.span.lo() + BytePos(brace_pos as u32 + 1);
|
2016-03-14 00:55:55 -05:00
|
|
|
self.block_indent = self.block_indent.block_indent(self.config);
|
|
|
|
|
2017-01-12 19:07:42 -06:00
|
|
|
if item.body.is_empty() {
|
2017-08-19 13:47:40 -05:00
|
|
|
self.format_missing_no_indent(item.span.hi() - BytePos(1));
|
2016-08-23 07:00:43 -05:00
|
|
|
self.block_indent = self.block_indent.block_unindent(self.config);
|
|
|
|
|
2017-06-15 18:49:49 -05:00
|
|
|
self.buffer
|
|
|
|
.push_str(&self.block_indent.to_string(self.config));
|
2016-08-23 07:00:43 -05:00
|
|
|
} else {
|
2017-01-12 19:07:42 -06:00
|
|
|
for item in &item.body {
|
|
|
|
self.format_body_element(item);
|
2016-08-23 07:00:43 -05:00
|
|
|
}
|
2015-09-21 13:02:45 -05:00
|
|
|
|
2016-08-23 07:00:43 -05:00
|
|
|
self.block_indent = self.block_indent.block_unindent(self.config);
|
2017-08-19 13:47:40 -05:00
|
|
|
self.format_missing_with_indent(item.span.hi() - BytePos(1));
|
2016-08-23 07:00:43 -05:00
|
|
|
}
|
2015-09-21 13:02:45 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
self.buffer.push_str("}");
|
2017-08-19 13:47:40 -05:00
|
|
|
self.last_pos = item.span.hi();
|
2017-01-12 19:07:42 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
fn format_body_element(&mut self, element: &BodyElement) {
|
|
|
|
match *element {
|
2017-08-29 08:16:04 -05:00
|
|
|
BodyElement::ForeignItem(item) => self.format_foreign_item(item),
|
2017-01-12 19:07:42 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn format_foreign_mod(&mut self, fm: &ast::ForeignMod, span: Span) {
|
|
|
|
let item = Item::from_foreign_mod(fm, span, self.config);
|
|
|
|
self.format_item(item);
|
2015-09-21 13:02:45 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2017-08-24 18:19:51 -05:00
|
|
|
fn format_foreign_item(&mut self, item: &ast::ForeignItem) {
|
2017-08-30 05:26:45 -05:00
|
|
|
let rewrite = item.rewrite(&self.get_context(), self.shape());
|
2017-08-24 18:19:51 -05:00
|
|
|
self.push_rewrite(item.span(), rewrite);
|
2017-08-19 13:47:40 -05:00
|
|
|
self.last_pos = item.span.hi();
|
2015-09-21 13:02:45 -05:00
|
|
|
}
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
pub fn rewrite_fn(
|
|
|
|
&mut self,
|
|
|
|
indent: Indent,
|
|
|
|
ident: ast::Ident,
|
|
|
|
fd: &ast::FnDecl,
|
|
|
|
generics: &ast::Generics,
|
|
|
|
unsafety: ast::Unsafety,
|
|
|
|
constness: ast::Constness,
|
|
|
|
defaultness: ast::Defaultness,
|
|
|
|
abi: abi::Abi,
|
|
|
|
vis: &ast::Visibility,
|
|
|
|
span: Span,
|
|
|
|
block: &ast::Block,
|
|
|
|
) -> Option<String> {
|
2015-11-22 06:45:51 -06:00
|
|
|
let context = self.get_context();
|
|
|
|
|
2017-08-19 13:47:40 -05:00
|
|
|
let block_snippet = self.snippet(mk_sp(block.span.lo(), block.span.hi()));
|
2017-04-24 02:50:11 -05:00
|
|
|
let has_body = !block_snippet[1..block_snippet.len() - 1].trim().is_empty() ||
|
2017-06-11 22:58:58 -05:00
|
|
|
!context.config.fn_empty_single_line();
|
2017-08-01 08:26:22 -05:00
|
|
|
let mut newline_brace = newline_for_brace(self.config, &generics.where_clause, has_body);
|
2017-06-11 22:58:58 -05:00
|
|
|
|
|
|
|
let (mut result, force_newline_brace) = try_opt!(rewrite_fn_base(
|
|
|
|
&context,
|
|
|
|
indent,
|
|
|
|
ident,
|
|
|
|
fd,
|
|
|
|
generics,
|
|
|
|
unsafety,
|
|
|
|
constness,
|
|
|
|
defaultness,
|
|
|
|
abi,
|
|
|
|
vis,
|
|
|
|
span,
|
|
|
|
newline_brace,
|
|
|
|
has_body,
|
|
|
|
true,
|
|
|
|
));
|
2015-05-03 17:12:39 -05:00
|
|
|
|
2017-06-03 16:29:08 -05:00
|
|
|
if force_newline_brace {
|
2015-10-08 22:07:14 -05:00
|
|
|
newline_brace = true;
|
2017-06-03 16:29:08 -05:00
|
|
|
} else if self.config.fn_brace_style() != BraceStyle::AlwaysNextLine &&
|
2017-07-19 08:50:28 -05:00
|
|
|
!result.contains('\n')
|
2017-06-11 22:58:58 -05:00
|
|
|
{
|
2017-06-03 16:29:08 -05:00
|
|
|
newline_brace = false;
|
2015-09-01 02:36:00 -05:00
|
|
|
}
|
|
|
|
|
2015-08-21 06:31:09 -05:00
|
|
|
// Prepare for the function body by possibly adding a newline and
|
|
|
|
// indent.
|
|
|
|
// FIXME we'll miss anything between the end of the signature and the
|
|
|
|
// start of the body, but we need more spans from the compiler to solve
|
|
|
|
// this.
|
2015-05-03 17:12:39 -05:00
|
|
|
if newline_brace {
|
|
|
|
result.push('\n');
|
2015-09-18 23:50:44 -05:00
|
|
|
result.push_str(&indent.to_string(self.config));
|
2015-05-03 17:12:39 -05:00
|
|
|
} else {
|
|
|
|
result.push(' ');
|
|
|
|
}
|
|
|
|
|
2017-05-02 21:26:25 -05:00
|
|
|
self.single_line_fn(&result, block).or_else(|| Some(result))
|
2015-05-03 17:12:39 -05:00
|
|
|
}
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
pub fn rewrite_required_fn(
|
|
|
|
&mut self,
|
|
|
|
indent: Indent,
|
|
|
|
ident: ast::Ident,
|
|
|
|
sig: &ast::MethodSig,
|
|
|
|
span: Span,
|
|
|
|
) -> Option<String> {
|
2015-12-01 15:09:37 -06:00
|
|
|
// Drop semicolon or it will be interpreted as comment.
|
2017-08-19 13:47:40 -05:00
|
|
|
let span = mk_sp(span.lo(), span.hi() - BytePos(1));
|
2015-11-22 06:45:51 -06:00
|
|
|
let context = self.get_context();
|
2015-05-03 17:12:39 -05:00
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
let (mut result, _) = try_opt!(rewrite_fn_base(
|
|
|
|
&context,
|
|
|
|
indent,
|
|
|
|
ident,
|
|
|
|
&sig.decl,
|
|
|
|
&sig.generics,
|
|
|
|
sig.unsafety,
|
|
|
|
sig.constness.node,
|
|
|
|
ast::Defaultness::Final,
|
|
|
|
sig.abi,
|
|
|
|
&ast::Visibility::Inherited,
|
|
|
|
span,
|
|
|
|
false,
|
|
|
|
false,
|
|
|
|
false,
|
|
|
|
));
|
2015-05-03 17:12:39 -05:00
|
|
|
|
|
|
|
// Re-attach semicolon
|
|
|
|
result.push(';');
|
|
|
|
|
2015-09-04 11:09:05 -05:00
|
|
|
Some(result)
|
2015-05-03 17:12:39 -05:00
|
|
|
}
|
|
|
|
|
2015-11-19 20:49:24 -06:00
|
|
|
fn single_line_fn(&self, fn_str: &str, block: &ast::Block) -> Option<String> {
|
2015-11-19 20:11:32 -06:00
|
|
|
if fn_str.contains('\n') {
|
|
|
|
return None;
|
|
|
|
}
|
2015-11-17 22:53:06 -06:00
|
|
|
|
|
|
|
let codemap = self.get_context().codemap;
|
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
if self.config.fn_empty_single_line() && is_empty_block(block, codemap) &&
|
2017-06-11 22:58:58 -05:00
|
|
|
self.block_indent.width() + fn_str.len() + 2 <= self.config.max_width()
|
|
|
|
{
|
2015-11-19 20:11:32 -06:00
|
|
|
return Some(format!("{}{{}}", fn_str));
|
2015-11-17 22:53:06 -06:00
|
|
|
}
|
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
if self.config.fn_single_line() && is_simple_block_stmt(block, codemap) {
|
2015-11-17 22:53:06 -06:00
|
|
|
let rewrite = {
|
2017-08-29 08:16:04 -05:00
|
|
|
if let Some(stmt) = block.stmts.first() {
|
2016-09-15 22:19:18 -05:00
|
|
|
match stmt_expr(stmt) {
|
|
|
|
Some(e) => {
|
2017-07-11 08:41:38 -05:00
|
|
|
let suffix = if semicolon_for_expr(&self.get_context(), e) {
|
|
|
|
";"
|
|
|
|
} else {
|
|
|
|
""
|
|
|
|
};
|
2016-09-15 22:19:18 -05:00
|
|
|
|
2017-08-30 05:26:45 -05:00
|
|
|
format_expr(&e, ExprType::Statement, &self.get_context(), self.shape())
|
|
|
|
.map(|s| s + suffix)
|
2016-09-15 22:19:18 -05:00
|
|
|
.or_else(|| Some(self.snippet(e.span)))
|
|
|
|
}
|
2017-08-30 05:26:45 -05:00
|
|
|
None => stmt.rewrite(&self.get_context(), self.shape()),
|
2016-09-15 22:19:18 -05:00
|
|
|
}
|
2015-11-17 22:53:06 -06:00
|
|
|
} else {
|
|
|
|
None
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
if let Some(res) = rewrite {
|
2015-11-19 20:11:32 -06:00
|
|
|
let width = self.block_indent.width() + fn_str.len() + res.len() + 4;
|
2017-05-16 03:47:09 -05:00
|
|
|
if !res.contains('\n') && width <= self.config.max_width() {
|
2015-11-17 22:53:06 -06:00
|
|
|
return Some(format!("{}{{ {} }}", fn_str, res));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
None
|
|
|
|
}
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
pub fn visit_enum(
|
|
|
|
&mut self,
|
|
|
|
ident: ast::Ident,
|
|
|
|
vis: &ast::Visibility,
|
|
|
|
enum_def: &ast::EnumDef,
|
|
|
|
generics: &ast::Generics,
|
|
|
|
span: Span,
|
|
|
|
) {
|
2017-06-24 05:45:22 -05:00
|
|
|
let enum_header = format_header("enum ", ident, vis);
|
|
|
|
self.buffer.push_str(&enum_header);
|
2015-05-29 05:41:26 -05:00
|
|
|
|
|
|
|
let enum_snippet = self.snippet(span);
|
2016-08-23 07:00:43 -05:00
|
|
|
let brace_pos = enum_snippet.find_uncommented("{").unwrap();
|
2017-08-19 13:47:40 -05:00
|
|
|
let body_start = span.lo() + BytePos(brace_pos as u32 + 1);
|
2017-06-11 22:58:58 -05:00
|
|
|
let generics_str = format_generics(
|
|
|
|
&self.get_context(),
|
|
|
|
generics,
|
|
|
|
"{",
|
|
|
|
"{",
|
|
|
|
self.config.item_brace_style(),
|
|
|
|
enum_def.variants.is_empty(),
|
|
|
|
self.block_indent,
|
2017-08-19 13:47:40 -05:00
|
|
|
mk_sp(span.lo(), body_start),
|
2017-06-24 05:45:22 -05:00
|
|
|
last_line_width(&enum_header),
|
2017-06-11 22:58:58 -05:00
|
|
|
).unwrap();
|
2015-07-26 07:05:43 -05:00
|
|
|
self.buffer.push_str(&generics_str);
|
2015-05-29 05:41:26 -05:00
|
|
|
|
|
|
|
self.last_pos = body_start;
|
|
|
|
|
2015-10-07 18:23:07 -05:00
|
|
|
self.block_indent = self.block_indent.block_indent(self.config);
|
2017-08-19 13:47:40 -05:00
|
|
|
let variant_list = self.format_variant_list(enum_def, body_start, span.hi() - BytePos(1));
|
2015-10-07 18:23:07 -05:00
|
|
|
match variant_list {
|
2016-08-23 09:14:45 -05:00
|
|
|
Some(ref body_str) => self.buffer.push_str(body_str),
|
2017-07-11 07:53:10 -05:00
|
|
|
None => if contains_comment(&enum_snippet[brace_pos..]) {
|
2017-08-19 13:47:40 -05:00
|
|
|
self.format_missing_no_indent(span.hi() - BytePos(1))
|
2017-07-11 07:53:10 -05:00
|
|
|
},
|
2015-05-29 05:41:26 -05:00
|
|
|
}
|
2015-09-18 23:50:44 -05:00
|
|
|
self.block_indent = self.block_indent.block_unindent(self.config);
|
2015-05-29 05:41:26 -05:00
|
|
|
|
2016-08-23 07:00:43 -05:00
|
|
|
if variant_list.is_some() || contains_comment(&enum_snippet[brace_pos..]) {
|
2017-06-15 18:49:49 -05:00
|
|
|
self.buffer
|
|
|
|
.push_str(&self.block_indent.to_string(self.config));
|
2015-10-07 18:23:07 -05:00
|
|
|
}
|
2015-07-26 07:05:43 -05:00
|
|
|
self.buffer.push_str("}");
|
2017-08-19 13:47:40 -05:00
|
|
|
self.last_pos = span.hi();
|
2015-10-07 18:23:07 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
// Format the body of an enum definition
|
2017-06-11 22:58:58 -05:00
|
|
|
fn format_variant_list(
|
|
|
|
&self,
|
|
|
|
enum_def: &ast::EnumDef,
|
|
|
|
body_lo: BytePos,
|
|
|
|
body_hi: BytePos,
|
|
|
|
) -> Option<String> {
|
2015-10-07 18:23:07 -05:00
|
|
|
if enum_def.variants.is_empty() {
|
|
|
|
return None;
|
|
|
|
}
|
|
|
|
let mut result = String::with_capacity(1024);
|
|
|
|
result.push('\n');
|
|
|
|
let indentation = self.block_indent.to_string(self.config);
|
|
|
|
result.push_str(&indentation);
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
let items = itemize_list(
|
|
|
|
self.codemap,
|
|
|
|
enum_def.variants.iter(),
|
|
|
|
"}",
|
|
|
|
|f| if !f.node.attrs.is_empty() {
|
2017-08-19 13:47:40 -05:00
|
|
|
f.node.attrs[0].span.lo()
|
2017-06-11 22:58:58 -05:00
|
|
|
} else {
|
2017-08-19 13:47:40 -05:00
|
|
|
f.span.lo()
|
2017-06-11 22:58:58 -05:00
|
|
|
},
|
2017-08-19 13:47:40 -05:00
|
|
|
|f| f.span.hi(),
|
2017-06-11 22:58:58 -05:00
|
|
|
|f| self.format_variant(f),
|
|
|
|
body_lo,
|
|
|
|
body_hi,
|
2017-08-07 03:29:55 -05:00
|
|
|
false,
|
2017-06-11 22:58:58 -05:00
|
|
|
);
|
2015-10-07 18:23:07 -05:00
|
|
|
|
2017-08-30 05:26:45 -05:00
|
|
|
let shape = self.shape().sub_width(2).unwrap();
|
2015-10-07 18:23:07 -05:00
|
|
|
let fmt = ListFormatting {
|
|
|
|
tactic: DefinitiveListTactic::Vertical,
|
|
|
|
separator: ",",
|
2017-05-16 03:47:09 -05:00
|
|
|
trailing_separator: self.config.trailing_comma(),
|
2017-08-18 09:19:47 -05:00
|
|
|
separator_place: SeparatorPlace::Back,
|
2017-05-07 17:24:12 -05:00
|
|
|
shape: shape,
|
2015-10-07 18:23:07 -05:00
|
|
|
ends_with_newline: true,
|
2017-07-26 08:43:36 -05:00
|
|
|
preserve_newline: true,
|
2015-10-07 18:23:07 -05:00
|
|
|
config: self.config,
|
|
|
|
};
|
|
|
|
|
2017-07-05 09:12:58 -05:00
|
|
|
let list = try_opt!(write_list(&items.collect::<Vec<_>>(), &fmt));
|
2015-10-07 18:23:07 -05:00
|
|
|
result.push_str(&list);
|
|
|
|
result.push('\n');
|
|
|
|
Some(result)
|
2015-05-29 05:41:26 -05:00
|
|
|
}
|
|
|
|
|
2015-09-21 13:02:45 -05:00
|
|
|
// Variant of an enum.
|
2015-10-07 18:23:07 -05:00
|
|
|
fn format_variant(&self, field: &ast::Variant) -> Option<String> {
|
|
|
|
if contains_skip(&field.node.attrs) {
|
2017-08-19 13:47:40 -05:00
|
|
|
let lo = field.node.attrs[0].span.lo();
|
|
|
|
let span = mk_sp(lo, field.span.hi());
|
2015-10-07 18:23:07 -05:00
|
|
|
return Some(self.snippet(span));
|
2015-05-29 05:41:26 -05:00
|
|
|
}
|
|
|
|
|
2017-06-04 09:27:21 -05:00
|
|
|
let context = self.get_context();
|
2015-10-07 18:23:07 -05:00
|
|
|
let indent = self.block_indent;
|
2017-08-30 05:26:45 -05:00
|
|
|
let shape = self.shape();
|
2017-08-11 03:52:49 -05:00
|
|
|
let attrs_str = try_opt!(field.node.attrs.rewrite(&context, shape));
|
|
|
|
let lo = field
|
|
|
|
.node
|
|
|
|
.attrs
|
|
|
|
.last()
|
2017-08-19 13:47:40 -05:00
|
|
|
.map_or(field.span.lo(), |attr| attr.span.hi());
|
|
|
|
let span = mk_sp(lo, field.span.lo());
|
2015-05-29 05:41:26 -05:00
|
|
|
|
2015-11-12 14:38:41 -06:00
|
|
|
let variant_body = match field.node.data {
|
2017-07-09 12:24:59 -05:00
|
|
|
ast::VariantData::Tuple(..) | ast::VariantData::Struct(..) => {
|
2015-10-08 22:07:14 -05:00
|
|
|
// FIXME: Should limit the width, as we have a trailing comma
|
2017-08-11 03:52:49 -05:00
|
|
|
try_opt!(format_struct(
|
2017-06-11 22:58:58 -05:00
|
|
|
&context,
|
|
|
|
"",
|
|
|
|
field.node.name,
|
|
|
|
&ast::Visibility::Inherited,
|
|
|
|
&field.node.data,
|
|
|
|
None,
|
|
|
|
field.span,
|
|
|
|
indent,
|
|
|
|
Some(self.config.struct_variant_width()),
|
2017-08-11 03:52:49 -05:00
|
|
|
))
|
2015-05-29 05:41:26 -05:00
|
|
|
}
|
2017-08-11 03:52:49 -05:00
|
|
|
ast::VariantData::Unit(..) => if let Some(ref expr) = field.node.disr_expr {
|
|
|
|
let one_line_width =
|
|
|
|
field.node.name.to_string().len() + self.snippet(expr.span).len() + 3;
|
|
|
|
if one_line_width <= shape.width {
|
2015-10-15 13:37:36 -05:00
|
|
|
format!("{} = {}", field.node.name, self.snippet(expr.span))
|
|
|
|
} else {
|
2017-08-11 03:52:49 -05:00
|
|
|
format!(
|
|
|
|
"{}\n{}{}",
|
|
|
|
field.node.name,
|
|
|
|
shape
|
|
|
|
.indent
|
|
|
|
.block_indent(self.config)
|
|
|
|
.to_string(self.config),
|
|
|
|
self.snippet(expr.span)
|
|
|
|
)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
String::from(field.node.name.to_string())
|
|
|
|
},
|
2015-07-01 13:49:45 -05:00
|
|
|
};
|
|
|
|
|
2017-08-19 13:51:24 -05:00
|
|
|
let attrs_extendable = attrs_str.is_empty() ||
|
|
|
|
(context.config.attributes_on_same_line_as_variant() &&
|
|
|
|
is_attributes_extendable(&attrs_str));
|
2017-08-11 03:52:49 -05:00
|
|
|
combine_strs_with_missing_comments(
|
|
|
|
&context,
|
|
|
|
&attrs_str,
|
|
|
|
&variant_body,
|
|
|
|
span,
|
|
|
|
shape,
|
2017-08-19 13:51:24 -05:00
|
|
|
attrs_extendable,
|
2017-08-11 03:52:49 -05:00
|
|
|
)
|
2015-06-23 08:58:58 -05:00
|
|
|
}
|
2015-11-22 06:45:51 -06:00
|
|
|
}
|
2015-05-29 05:41:26 -05:00
|
|
|
|
2017-06-12 21:49:47 -05:00
|
|
|
pub fn format_impl(
|
|
|
|
context: &RewriteContext,
|
|
|
|
item: &ast::Item,
|
|
|
|
offset: Indent,
|
|
|
|
where_span_end: Option<BytePos>,
|
|
|
|
) -> Option<String> {
|
2017-07-10 00:35:50 -05:00
|
|
|
if let ast::ItemKind::Impl(_, _, _, ref generics, _, ref self_ty, ref items) = item.node {
|
2017-08-27 10:16:54 -05:00
|
|
|
let mut result = String::with_capacity(128);
|
2017-06-11 00:32:44 -05:00
|
|
|
let ref_and_type = try_opt!(format_impl_ref_and_type(context, item, offset));
|
2017-08-27 10:16:54 -05:00
|
|
|
let indent_str = offset.to_string(context.config);
|
|
|
|
let sep = format!("\n{}", &indent_str);
|
2016-09-06 00:11:56 -05:00
|
|
|
result.push_str(&ref_and_type);
|
2015-11-22 17:00:22 -06:00
|
|
|
|
2017-06-10 05:45:23 -05:00
|
|
|
let where_budget = if result.contains('\n') {
|
|
|
|
context.config.max_width()
|
|
|
|
} else {
|
2017-08-29 01:19:56 -05:00
|
|
|
context.budget(last_line_width(&result))
|
2017-06-10 05:45:23 -05:00
|
|
|
};
|
2017-08-02 09:26:35 -05:00
|
|
|
let option = WhereClauseOption::snuggled(&ref_and_type);
|
2017-06-12 21:49:47 -05:00
|
|
|
let where_clause_str = try_opt!(rewrite_where_clause(
|
|
|
|
context,
|
|
|
|
&generics.where_clause,
|
|
|
|
context.config.item_brace_style(),
|
|
|
|
Shape::legacy(where_budget, offset.block_only()),
|
|
|
|
context.config.where_density(),
|
|
|
|
"{",
|
|
|
|
where_span_end,
|
2017-08-19 13:47:40 -05:00
|
|
|
self_ty.span.hi(),
|
2017-08-02 09:26:35 -05:00
|
|
|
option,
|
2017-06-12 21:49:47 -05:00
|
|
|
));
|
|
|
|
|
2017-08-27 10:16:54 -05:00
|
|
|
// If there is no where clause, we may have missing comments between the trait name and
|
|
|
|
// the opening brace.
|
|
|
|
if generics.where_clause.predicates.is_empty() {
|
|
|
|
if let Some(hi) = where_span_end {
|
|
|
|
match recover_missing_comment_in_span(
|
2017-08-30 21:11:52 -05:00
|
|
|
mk_sp(self_ty.span.hi(), hi),
|
2017-08-27 10:16:54 -05:00
|
|
|
Shape::indented(offset, context.config),
|
|
|
|
context,
|
|
|
|
last_line_width(&result),
|
|
|
|
) {
|
|
|
|
Some(ref missing_comment) if !missing_comment.is_empty() => {
|
|
|
|
result.push_str(missing_comment);
|
|
|
|
}
|
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-12 21:49:47 -05:00
|
|
|
if try_opt!(is_impl_single_line(
|
|
|
|
context,
|
2017-08-29 08:16:04 -05:00
|
|
|
items,
|
2017-06-12 21:49:47 -05:00
|
|
|
&result,
|
|
|
|
&where_clause_str,
|
2017-08-29 08:16:04 -05:00
|
|
|
item,
|
2017-06-17 07:17:20 -05:00
|
|
|
)) {
|
2016-01-09 23:45:58 -06:00
|
|
|
result.push_str(&where_clause_str);
|
2017-08-27 10:16:54 -05:00
|
|
|
if where_clause_str.contains('\n') || last_line_contains_single_line_comment(&result) {
|
|
|
|
result.push_str(&format!("{}{{{}}}", &sep, &sep));
|
2016-01-09 23:45:58 -06:00
|
|
|
} else {
|
|
|
|
result.push_str(" {}");
|
|
|
|
}
|
|
|
|
return Some(result);
|
|
|
|
}
|
|
|
|
|
|
|
|
if !where_clause_str.is_empty() && !where_clause_str.contains('\n') {
|
2015-11-22 17:00:22 -06:00
|
|
|
result.push('\n');
|
2017-05-16 03:47:09 -05:00
|
|
|
let width = offset.block_indent + context.config.tab_spaces() - 1;
|
2015-11-22 17:00:22 -06:00
|
|
|
let where_indent = Indent::new(0, width);
|
|
|
|
result.push_str(&where_indent.to_string(context.config));
|
|
|
|
}
|
|
|
|
result.push_str(&where_clause_str);
|
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
match context.config.item_brace_style() {
|
2017-08-27 10:16:54 -05:00
|
|
|
_ if last_line_contains_single_line_comment(&result) => result.push_str(&sep),
|
|
|
|
BraceStyle::AlwaysNextLine => result.push_str(&sep),
|
2015-11-22 17:00:22 -06:00
|
|
|
BraceStyle::PreferSameLine => result.push(' '),
|
2017-07-11 07:53:10 -05:00
|
|
|
BraceStyle::SameLineWhere => if !where_clause_str.is_empty() {
|
2017-08-27 10:16:54 -05:00
|
|
|
result.push_str(&sep);
|
2017-07-11 07:53:10 -05:00
|
|
|
} else {
|
|
|
|
result.push(' ');
|
|
|
|
},
|
2015-11-22 17:00:22 -06:00
|
|
|
}
|
2016-01-09 23:45:58 -06:00
|
|
|
|
2015-11-22 17:00:22 -06:00
|
|
|
result.push('{');
|
|
|
|
|
2015-11-23 22:54:44 -06:00
|
|
|
let snippet = context.snippet(item.span);
|
|
|
|
let open_pos = try_opt!(snippet.find_uncommented("{")) + 1;
|
|
|
|
|
|
|
|
if !items.is_empty() || contains_comment(&snippet[open_pos..]) {
|
2016-02-05 14:59:41 -06:00
|
|
|
let mut visitor = FmtVisitor::from_codemap(context.parse_session, context.config);
|
2017-03-27 17:25:59 -05:00
|
|
|
visitor.block_indent = offset.block_only().block_indent(context.config);
|
2017-08-19 13:47:40 -05:00
|
|
|
visitor.last_pos = item.span.lo() + BytePos(open_pos as u32);
|
2015-11-22 17:00:22 -06:00
|
|
|
|
2017-07-24 10:55:55 -05:00
|
|
|
visitor.visit_attrs(&item.attrs, ast::AttrStyle::Inner);
|
2015-11-22 17:00:22 -06:00
|
|
|
for item in items {
|
2016-08-23 09:14:45 -05:00
|
|
|
visitor.visit_impl_item(item);
|
2015-11-22 17:00:22 -06:00
|
|
|
}
|
|
|
|
|
2017-08-19 13:47:40 -05:00
|
|
|
visitor.format_missing(item.span.hi() - BytePos(1));
|
2015-11-23 22:54:44 -06:00
|
|
|
|
|
|
|
let inner_indent_str = visitor.block_indent.to_string(context.config);
|
2017-02-20 19:43:43 -06:00
|
|
|
let outer_indent_str = offset.block_only().to_string(context.config);
|
2015-11-23 22:54:44 -06:00
|
|
|
|
2015-11-22 20:49:21 -06:00
|
|
|
result.push('\n');
|
2015-11-23 22:54:44 -06:00
|
|
|
result.push_str(&inner_indent_str);
|
2016-08-23 09:14:45 -05:00
|
|
|
result.push_str(trim_newlines(visitor.buffer.to_string().trim()));
|
2015-11-22 17:00:22 -06:00
|
|
|
result.push('\n');
|
2015-11-23 22:54:44 -06:00
|
|
|
result.push_str(&outer_indent_str);
|
2015-11-22 17:00:22 -06:00
|
|
|
}
|
|
|
|
|
2016-01-09 23:45:58 -06:00
|
|
|
if result.chars().last().unwrap() == '{' {
|
2017-08-27 10:16:54 -05:00
|
|
|
result.push_str(&sep);
|
2016-01-09 23:45:58 -06:00
|
|
|
}
|
2015-11-23 22:54:44 -06:00
|
|
|
result.push('}');
|
2016-01-09 23:45:58 -06:00
|
|
|
|
2015-11-22 17:00:22 -06:00
|
|
|
Some(result)
|
|
|
|
} else {
|
|
|
|
unreachable!();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
fn is_impl_single_line(
|
|
|
|
context: &RewriteContext,
|
|
|
|
items: &[ImplItem],
|
|
|
|
result: &str,
|
|
|
|
where_clause_str: &str,
|
|
|
|
item: &ast::Item,
|
|
|
|
) -> Option<bool> {
|
2016-01-09 23:45:58 -06:00
|
|
|
let snippet = context.snippet(item.span);
|
|
|
|
let open_pos = try_opt!(snippet.find_uncommented("{")) + 1;
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
Some(
|
2017-08-27 10:16:54 -05:00
|
|
|
context.config.impl_empty_single_line() && items.is_empty() && !result.contains('\n') &&
|
2017-06-11 22:58:58 -05:00
|
|
|
result.len() + where_clause_str.len() <= context.config.max_width() &&
|
|
|
|
!contains_comment(&snippet[open_pos..]),
|
|
|
|
)
|
2016-01-09 23:45:58 -06:00
|
|
|
}
|
|
|
|
|
2017-06-12 21:49:47 -05:00
|
|
|
fn format_impl_ref_and_type(
|
|
|
|
context: &RewriteContext,
|
|
|
|
item: &ast::Item,
|
|
|
|
offset: Indent,
|
|
|
|
) -> Option<String> {
|
2017-06-15 02:26:41 -05:00
|
|
|
if let ast::ItemKind::Impl(
|
|
|
|
unsafety,
|
|
|
|
polarity,
|
2017-07-26 19:43:35 -05:00
|
|
|
defaultness,
|
2017-06-15 02:26:41 -05:00
|
|
|
ref generics,
|
|
|
|
ref trait_ref,
|
|
|
|
ref self_ty,
|
|
|
|
_,
|
|
|
|
) = item.node
|
2017-06-11 22:58:58 -05:00
|
|
|
{
|
2017-08-27 10:24:10 -05:00
|
|
|
let mut result = String::with_capacity(128);
|
2016-09-06 00:11:56 -05:00
|
|
|
|
2017-03-09 20:58:35 -06:00
|
|
|
result.push_str(&format_visibility(&item.vis));
|
2017-08-29 08:16:04 -05:00
|
|
|
result.push_str(format_defaultness(defaultness));
|
2016-09-06 00:11:56 -05:00
|
|
|
result.push_str(format_unsafety(unsafety));
|
|
|
|
result.push_str("impl");
|
|
|
|
|
|
|
|
let lo = context.codemap.span_after(item.span, "impl");
|
|
|
|
let hi = match *trait_ref {
|
2017-08-19 13:47:40 -05:00
|
|
|
Some(ref tr) => tr.path.span.lo(),
|
|
|
|
None => self_ty.span.lo(),
|
2016-09-06 00:11:56 -05:00
|
|
|
};
|
2017-06-17 12:00:58 -05:00
|
|
|
let shape = try_opt!(generics_shape_from_config(
|
2017-06-12 21:49:47 -05:00
|
|
|
context.config,
|
|
|
|
Shape::indented(offset + last_line_width(&result), context.config),
|
|
|
|
0,
|
2017-06-17 12:00:58 -05:00
|
|
|
));
|
|
|
|
let one_line_budget = try_opt!(shape.width.checked_sub(last_line_width(&result) + 2));
|
2017-06-12 21:49:47 -05:00
|
|
|
let generics_str = try_opt!(rewrite_generics_inner(
|
|
|
|
context,
|
|
|
|
generics,
|
|
|
|
shape,
|
2017-06-17 12:00:58 -05:00
|
|
|
one_line_budget,
|
2017-06-12 21:49:47 -05:00
|
|
|
mk_sp(lo, hi),
|
|
|
|
));
|
2016-09-06 00:11:56 -05:00
|
|
|
|
2017-06-11 00:32:44 -05:00
|
|
|
let polarity_str = if polarity == ast::ImplPolarity::Negative {
|
|
|
|
"!"
|
|
|
|
} else {
|
|
|
|
""
|
|
|
|
};
|
2016-09-06 00:11:56 -05:00
|
|
|
|
|
|
|
if let Some(ref trait_ref) = *trait_ref {
|
2017-06-11 18:53:19 -05:00
|
|
|
let result_len = result.len();
|
2017-07-09 12:24:59 -05:00
|
|
|
if let Some(trait_ref_str) = rewrite_trait_ref(
|
|
|
|
context,
|
2017-08-29 08:16:04 -05:00
|
|
|
trait_ref,
|
2017-07-09 12:24:59 -05:00
|
|
|
offset,
|
|
|
|
&generics_str,
|
|
|
|
true,
|
|
|
|
polarity_str,
|
|
|
|
result_len,
|
|
|
|
) {
|
2017-06-11 18:53:19 -05:00
|
|
|
result.push_str(&trait_ref_str);
|
2016-09-06 00:11:56 -05:00
|
|
|
} else {
|
2017-06-12 21:49:47 -05:00
|
|
|
let generics_str = try_opt!(rewrite_generics_inner(
|
|
|
|
context,
|
|
|
|
generics,
|
|
|
|
shape,
|
|
|
|
0,
|
|
|
|
mk_sp(lo, hi),
|
|
|
|
));
|
|
|
|
result.push_str(&try_opt!(rewrite_trait_ref(
|
|
|
|
context,
|
2017-08-29 08:16:04 -05:00
|
|
|
trait_ref,
|
2017-06-12 21:49:47 -05:00
|
|
|
offset,
|
|
|
|
&generics_str,
|
|
|
|
false,
|
|
|
|
polarity_str,
|
|
|
|
result_len,
|
|
|
|
)));
|
2016-09-06 00:11:56 -05:00
|
|
|
}
|
2017-06-10 05:45:23 -05:00
|
|
|
} else {
|
|
|
|
result.push_str(&generics_str);
|
2016-09-06 00:11:56 -05:00
|
|
|
}
|
|
|
|
|
2017-06-11 00:32:44 -05:00
|
|
|
// Try to put the self type in a single line.
|
|
|
|
// ` for`
|
|
|
|
let trait_ref_overhead = if trait_ref.is_some() { 4 } else { 0 };
|
|
|
|
let curly_brace_overhead = if generics.where_clause.predicates.is_empty() {
|
2016-09-06 00:11:56 -05:00
|
|
|
// If there is no where clause adapt budget for type formatting to take space and curly
|
|
|
|
// brace into account.
|
2017-05-16 03:47:09 -05:00
|
|
|
match context.config.item_brace_style() {
|
2017-06-11 00:32:44 -05:00
|
|
|
BraceStyle::AlwaysNextLine => 0,
|
|
|
|
_ => 2,
|
2016-09-06 00:11:56 -05:00
|
|
|
}
|
2017-06-11 00:32:44 -05:00
|
|
|
} else {
|
|
|
|
0
|
|
|
|
};
|
|
|
|
let used_space = last_line_width(&result) + trait_ref_overhead + curly_brace_overhead;
|
2017-01-16 18:08:36 -06:00
|
|
|
// 1 = space before the type.
|
2017-08-29 01:19:56 -05:00
|
|
|
let budget = context.budget(used_space + 1);
|
2017-06-11 00:32:44 -05:00
|
|
|
if let Some(self_ty_str) = self_ty.rewrite(context, Shape::legacy(budget, offset)) {
|
|
|
|
if !self_ty_str.contains('\n') {
|
|
|
|
if trait_ref.is_some() {
|
|
|
|
result.push_str(" for ");
|
|
|
|
} else {
|
|
|
|
result.push(' ');
|
|
|
|
}
|
|
|
|
result.push_str(&self_ty_str);
|
|
|
|
return Some(result);
|
|
|
|
}
|
2017-01-16 18:08:36 -06:00
|
|
|
}
|
2016-09-06 00:11:56 -05:00
|
|
|
|
2017-06-11 00:32:44 -05:00
|
|
|
// Couldn't fit the self type on a single line, put it on a new line.
|
|
|
|
result.push('\n');
|
|
|
|
// Add indentation of one additional tab.
|
|
|
|
let new_line_offset = offset.block_indent(context.config);
|
|
|
|
result.push_str(&new_line_offset.to_string(context.config));
|
|
|
|
if trait_ref.is_some() {
|
|
|
|
result.push_str("for ");
|
|
|
|
}
|
2017-08-29 01:19:56 -05:00
|
|
|
let budget = context.budget(last_line_width(&result));
|
2017-06-11 00:32:44 -05:00
|
|
|
let type_offset = match context.config.where_style() {
|
|
|
|
Style::Legacy => new_line_offset + trait_ref_overhead,
|
|
|
|
Style::Rfc => new_line_offset,
|
|
|
|
};
|
2017-06-16 04:56:32 -05:00
|
|
|
result.push_str(&*try_opt!(
|
|
|
|
self_ty.rewrite(context, Shape::legacy(budget, type_offset))
|
|
|
|
));
|
2016-09-06 00:11:56 -05:00
|
|
|
Some(result)
|
|
|
|
} else {
|
|
|
|
unreachable!();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-12 21:49:47 -05:00
|
|
|
fn rewrite_trait_ref(
|
|
|
|
context: &RewriteContext,
|
|
|
|
trait_ref: &ast::TraitRef,
|
|
|
|
offset: Indent,
|
|
|
|
generics_str: &str,
|
|
|
|
retry: bool,
|
|
|
|
polarity_str: &str,
|
|
|
|
result_len: usize,
|
|
|
|
) -> Option<String> {
|
2017-06-11 00:32:44 -05:00
|
|
|
// 1 = space between generics and trait_ref
|
2017-08-01 08:23:12 -05:00
|
|
|
let used_space = 1 + polarity_str.len() + last_line_used_width(generics_str, result_len);
|
2017-06-11 00:32:44 -05:00
|
|
|
let shape = Shape::indented(offset + used_space, context.config);
|
|
|
|
if let Some(trait_ref_str) = trait_ref.rewrite(context, shape) {
|
|
|
|
if !(retry && trait_ref_str.contains('\n')) {
|
2017-06-12 21:49:47 -05:00
|
|
|
return Some(format!(
|
|
|
|
"{} {}{}",
|
|
|
|
generics_str,
|
|
|
|
polarity_str,
|
|
|
|
&trait_ref_str
|
|
|
|
));
|
2017-06-10 06:37:34 -05:00
|
|
|
}
|
|
|
|
}
|
2017-06-11 00:32:44 -05:00
|
|
|
// We could not make enough space for trait_ref, so put it on new line.
|
|
|
|
if !retry {
|
|
|
|
let offset = offset.block_indent(context.config);
|
|
|
|
let shape = Shape::indented(offset, context.config);
|
2017-06-11 18:53:19 -05:00
|
|
|
let trait_ref_str = try_opt!(trait_ref.rewrite(context, shape));
|
2017-06-12 21:49:47 -05:00
|
|
|
Some(format!(
|
|
|
|
"{}\n{}{}{}",
|
|
|
|
generics_str,
|
|
|
|
&offset.to_string(context.config),
|
|
|
|
polarity_str,
|
|
|
|
&trait_ref_str
|
|
|
|
))
|
2017-06-11 18:53:19 -05:00
|
|
|
} else {
|
|
|
|
None
|
2017-06-10 06:37:34 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-12 21:49:47 -05:00
|
|
|
pub fn format_struct(
|
|
|
|
context: &RewriteContext,
|
|
|
|
item_name: &str,
|
|
|
|
ident: ast::Ident,
|
|
|
|
vis: &ast::Visibility,
|
|
|
|
struct_def: &ast::VariantData,
|
|
|
|
generics: Option<&ast::Generics>,
|
|
|
|
span: Span,
|
|
|
|
offset: Indent,
|
|
|
|
one_line_width: Option<usize>,
|
|
|
|
) -> Option<String> {
|
2015-11-22 06:45:51 -06:00
|
|
|
match *struct_def {
|
2016-05-27 17:58:25 -05:00
|
|
|
ast::VariantData::Unit(..) => Some(format_unit_struct(item_name, ident, vis)),
|
2017-07-11 07:53:10 -05:00
|
|
|
ast::VariantData::Tuple(ref fields, _) => format_tuple_struct(
|
|
|
|
context,
|
|
|
|
item_name,
|
|
|
|
ident,
|
|
|
|
vis,
|
|
|
|
fields,
|
|
|
|
generics,
|
|
|
|
span,
|
|
|
|
offset,
|
|
|
|
),
|
|
|
|
ast::VariantData::Struct(ref fields, _) => format_struct_struct(
|
|
|
|
context,
|
|
|
|
item_name,
|
|
|
|
ident,
|
|
|
|
vis,
|
|
|
|
fields,
|
|
|
|
generics,
|
|
|
|
span,
|
|
|
|
offset,
|
|
|
|
one_line_width,
|
|
|
|
),
|
2015-11-09 00:00:04 -06:00
|
|
|
}
|
2015-11-22 06:45:51 -06:00
|
|
|
}
|
2015-11-09 00:00:04 -06:00
|
|
|
|
2016-03-11 15:18:30 -06:00
|
|
|
pub fn format_trait(context: &RewriteContext, item: &ast::Item, offset: Indent) -> Option<String> {
|
2016-03-12 12:09:27 -06:00
|
|
|
if let ast::ItemKind::Trait(unsafety, ref generics, ref type_param_bounds, ref trait_items) =
|
2017-06-11 22:58:58 -05:00
|
|
|
item.node
|
|
|
|
{
|
2017-08-27 10:17:19 -05:00
|
|
|
let mut result = String::with_capacity(128);
|
2017-06-11 22:58:58 -05:00
|
|
|
let header = format!(
|
|
|
|
"{}{}trait {}",
|
|
|
|
format_visibility(&item.vis),
|
|
|
|
format_unsafety(unsafety),
|
|
|
|
item.ident
|
|
|
|
);
|
2016-03-11 15:18:30 -06:00
|
|
|
|
|
|
|
result.push_str(&header);
|
|
|
|
|
2016-03-14 21:51:41 -05:00
|
|
|
let body_lo = context.codemap.span_after(item.span, "{");
|
2016-03-11 15:18:30 -06:00
|
|
|
|
2017-06-11 09:26:49 -05:00
|
|
|
let shape = Shape::indented(offset + last_line_width(&result), context.config);
|
2017-06-12 21:49:47 -05:00
|
|
|
let generics_str = try_opt!(rewrite_generics(
|
|
|
|
context,
|
|
|
|
generics,
|
|
|
|
shape,
|
2017-08-19 13:47:40 -05:00
|
|
|
mk_sp(item.span.lo(), body_lo),
|
2017-06-12 21:49:47 -05:00
|
|
|
));
|
2016-03-11 15:18:30 -06:00
|
|
|
result.push_str(&generics_str);
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
let trait_bound_str = try_opt!(rewrite_trait_bounds(
|
|
|
|
context,
|
|
|
|
type_param_bounds,
|
2017-06-17 12:00:58 -05:00
|
|
|
Shape::indented(offset, context.config),
|
2017-06-11 22:58:58 -05:00
|
|
|
));
|
2016-03-15 15:08:12 -05:00
|
|
|
// If the trait, generics, and trait bound cannot fit on the same line,
|
|
|
|
// put the trait bounds on an indented new line
|
|
|
|
if offset.width() + last_line_width(&result) + trait_bound_str.len() >
|
2017-06-11 22:58:58 -05:00
|
|
|
context.config.comment_width()
|
|
|
|
{
|
2016-03-11 23:32:08 -06:00
|
|
|
result.push('\n');
|
2017-03-27 17:25:59 -05:00
|
|
|
let trait_indent = offset.block_only().block_indent(context.config);
|
2016-03-11 23:32:08 -06:00
|
|
|
result.push_str(&trait_indent.to_string(context.config));
|
|
|
|
}
|
2016-03-11 15:18:30 -06:00
|
|
|
result.push_str(&trait_bound_str);
|
|
|
|
|
2016-03-15 15:08:12 -05:00
|
|
|
let has_body = !trait_items.is_empty();
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
let where_density = if (context.config.where_density() == Density::Compressed &&
|
2017-07-19 10:35:00 -05:00
|
|
|
(!result.contains('\n') || context.config.fn_args_layout() == IndentStyle::Block)) ||
|
2017-06-11 22:58:58 -05:00
|
|
|
(context.config.fn_args_layout() == IndentStyle::Block && result.is_empty()) ||
|
|
|
|
(context.config.where_density() == Density::CompressedIfEmpty && !has_body &&
|
2017-07-19 10:35:00 -05:00
|
|
|
!result.contains('\n'))
|
2017-06-11 22:58:58 -05:00
|
|
|
{
|
|
|
|
Density::Compressed
|
|
|
|
} else {
|
|
|
|
Density::Tall
|
|
|
|
};
|
2016-03-15 15:08:12 -05:00
|
|
|
|
2017-08-29 01:19:56 -05:00
|
|
|
let where_budget = context.budget(last_line_width(&result));
|
2017-07-10 00:35:50 -05:00
|
|
|
let pos_before_where = if type_param_bounds.is_empty() {
|
2017-08-19 13:47:40 -05:00
|
|
|
generics.where_clause.span.lo()
|
2017-07-10 00:35:50 -05:00
|
|
|
} else {
|
2017-08-19 13:47:40 -05:00
|
|
|
type_param_bounds[type_param_bounds.len() - 1].span().hi()
|
2017-07-10 00:35:50 -05:00
|
|
|
};
|
2017-08-02 09:26:35 -05:00
|
|
|
let option = WhereClauseOption::snuggled(&generics_str);
|
2017-06-11 22:58:58 -05:00
|
|
|
let where_clause_str = try_opt!(rewrite_where_clause(
|
|
|
|
context,
|
|
|
|
&generics.where_clause,
|
|
|
|
context.config.item_brace_style(),
|
|
|
|
Shape::legacy(where_budget, offset.block_only()),
|
|
|
|
where_density,
|
|
|
|
"{",
|
|
|
|
None,
|
2017-07-10 00:35:50 -05:00
|
|
|
pos_before_where,
|
2017-08-02 09:26:35 -05:00
|
|
|
option,
|
2017-06-11 22:58:58 -05:00
|
|
|
));
|
2016-03-15 15:08:12 -05:00
|
|
|
// If the where clause cannot fit on the same line,
|
|
|
|
// put the where clause on a new line
|
2016-03-11 15:49:11 -06:00
|
|
|
if !where_clause_str.contains('\n') &&
|
2017-06-11 22:58:58 -05:00
|
|
|
last_line_width(&result) + where_clause_str.len() + offset.width() >
|
|
|
|
context.config.comment_width()
|
|
|
|
{
|
2016-03-11 15:49:11 -06:00
|
|
|
result.push('\n');
|
2017-05-16 03:47:09 -05:00
|
|
|
let width = offset.block_indent + context.config.tab_spaces() - 1;
|
2016-03-11 15:49:11 -06:00
|
|
|
let where_indent = Indent::new(0, width);
|
|
|
|
result.push_str(&where_indent.to_string(context.config));
|
|
|
|
}
|
|
|
|
result.push_str(&where_clause_str);
|
|
|
|
|
2017-08-27 10:17:19 -05:00
|
|
|
if generics.where_clause.predicates.is_empty() {
|
|
|
|
let item_snippet = context.snippet(item.span);
|
|
|
|
if let Some(lo) = item_snippet.chars().position(|c| c == '/') {
|
|
|
|
// 1 = `{`
|
|
|
|
let comment_hi = body_lo - BytePos(1);
|
2017-08-30 21:11:52 -05:00
|
|
|
let comment_lo = item.span.lo() + BytePos(lo as u32);
|
2017-08-27 10:17:19 -05:00
|
|
|
if comment_lo < comment_hi {
|
|
|
|
match recover_missing_comment_in_span(
|
|
|
|
mk_sp(comment_lo, comment_hi),
|
|
|
|
Shape::indented(offset, context.config),
|
|
|
|
context,
|
|
|
|
last_line_width(&result),
|
|
|
|
) {
|
|
|
|
Some(ref missing_comment) if !missing_comment.is_empty() => {
|
|
|
|
result.push_str(missing_comment);
|
|
|
|
}
|
|
|
|
_ => (),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
match context.config.item_brace_style() {
|
2017-08-27 10:17:19 -05:00
|
|
|
_ if last_line_contains_single_line_comment(&result) => {
|
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&offset.to_string(context.config));
|
|
|
|
}
|
2016-03-11 23:32:08 -06:00
|
|
|
BraceStyle::AlwaysNextLine => {
|
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&offset.to_string(context.config));
|
2016-03-11 23:41:22 -06:00
|
|
|
}
|
2016-03-11 23:32:08 -06:00
|
|
|
BraceStyle::PreferSameLine => result.push(' '),
|
2017-07-11 07:53:10 -05:00
|
|
|
BraceStyle::SameLineWhere => if !where_clause_str.is_empty() &&
|
|
|
|
(!trait_items.is_empty() || result.contains('\n'))
|
|
|
|
{
|
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&offset.to_string(context.config));
|
|
|
|
} else {
|
|
|
|
result.push(' ');
|
|
|
|
},
|
2016-03-11 23:32:08 -06:00
|
|
|
}
|
|
|
|
result.push('{');
|
|
|
|
|
|
|
|
let snippet = context.snippet(item.span);
|
|
|
|
let open_pos = try_opt!(snippet.find_uncommented("{")) + 1;
|
|
|
|
|
|
|
|
if !trait_items.is_empty() || contains_comment(&snippet[open_pos..]) {
|
2016-03-12 12:09:27 -06:00
|
|
|
let mut visitor = FmtVisitor::from_codemap(context.parse_session, context.config);
|
2017-03-27 17:25:59 -05:00
|
|
|
visitor.block_indent = offset.block_only().block_indent(context.config);
|
2017-08-19 13:47:40 -05:00
|
|
|
visitor.last_pos = item.span.lo() + BytePos(open_pos as u32);
|
2016-03-11 23:32:08 -06:00
|
|
|
|
|
|
|
for item in trait_items {
|
2016-08-23 09:14:45 -05:00
|
|
|
visitor.visit_trait_item(item);
|
2016-03-11 23:32:08 -06:00
|
|
|
}
|
|
|
|
|
2017-08-19 13:47:40 -05:00
|
|
|
visitor.format_missing(item.span.hi() - BytePos(1));
|
2016-03-11 23:32:08 -06:00
|
|
|
|
|
|
|
let inner_indent_str = visitor.block_indent.to_string(context.config);
|
2017-02-20 19:43:43 -06:00
|
|
|
let outer_indent_str = offset.block_only().to_string(context.config);
|
2016-03-11 23:32:08 -06:00
|
|
|
|
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&inner_indent_str);
|
2016-08-23 09:14:45 -05:00
|
|
|
result.push_str(trim_newlines(visitor.buffer.to_string().trim()));
|
2016-03-11 23:32:08 -06:00
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&outer_indent_str);
|
2016-03-15 15:08:12 -05:00
|
|
|
} else if result.contains('\n') {
|
|
|
|
result.push('\n');
|
2016-03-11 15:18:30 -06:00
|
|
|
}
|
|
|
|
|
2016-03-11 23:32:08 -06:00
|
|
|
result.push('}');
|
2016-03-11 15:18:30 -06:00
|
|
|
Some(result)
|
|
|
|
} else {
|
|
|
|
unreachable!();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-05-27 17:58:25 -05:00
|
|
|
fn format_unit_struct(item_name: &str, ident: ast::Ident, vis: &ast::Visibility) -> String {
|
|
|
|
format!("{};", format_header(item_name, ident, vis))
|
2015-11-22 06:45:51 -06:00
|
|
|
}
|
2015-10-18 17:25:38 -05:00
|
|
|
|
2017-07-10 03:26:55 -05:00
|
|
|
pub fn format_struct_struct(
|
2017-06-11 22:58:58 -05:00
|
|
|
context: &RewriteContext,
|
|
|
|
item_name: &str,
|
|
|
|
ident: ast::Ident,
|
|
|
|
vis: &ast::Visibility,
|
|
|
|
fields: &[ast::StructField],
|
|
|
|
generics: Option<&ast::Generics>,
|
|
|
|
span: Span,
|
|
|
|
offset: Indent,
|
|
|
|
one_line_width: Option<usize>,
|
|
|
|
) -> Option<String> {
|
2015-11-22 06:45:51 -06:00
|
|
|
let mut result = String::with_capacity(1024);
|
|
|
|
|
2016-05-27 17:58:25 -05:00
|
|
|
let header_str = format_header(item_name, ident, vis);
|
2015-11-22 06:45:51 -06:00
|
|
|
result.push_str(&header_str);
|
|
|
|
|
2016-03-07 12:41:32 -06:00
|
|
|
let body_lo = context.codemap.span_after(span, "{");
|
2015-11-22 06:45:51 -06:00
|
|
|
|
|
|
|
let generics_str = match generics {
|
2017-07-11 07:53:10 -05:00
|
|
|
Some(g) => try_opt!(format_generics(
|
|
|
|
context,
|
|
|
|
g,
|
|
|
|
"{",
|
|
|
|
"{",
|
|
|
|
context.config.item_brace_style(),
|
|
|
|
fields.is_empty(),
|
|
|
|
offset,
|
2017-08-19 13:47:40 -05:00
|
|
|
mk_sp(span.lo(), body_lo),
|
2017-07-11 07:53:10 -05:00
|
|
|
last_line_width(&result),
|
|
|
|
)),
|
2015-11-22 06:45:51 -06:00
|
|
|
None => {
|
2017-06-24 05:45:22 -05:00
|
|
|
// 3 = ` {}`, 2 = ` {`.
|
|
|
|
let overhead = if fields.is_empty() { 3 } else { 2 };
|
|
|
|
if (context.config.item_brace_style() == BraceStyle::AlwaysNextLine &&
|
2017-07-19 10:35:00 -05:00
|
|
|
!fields.is_empty()) ||
|
2017-08-29 01:19:56 -05:00
|
|
|
context.config.max_width() < overhead + result.len()
|
2017-06-11 22:58:58 -05:00
|
|
|
{
|
2017-02-20 19:43:43 -06:00
|
|
|
format!("\n{}{{", offset.block_only().to_string(context.config))
|
2015-11-19 00:34:14 -06:00
|
|
|
} else {
|
2015-11-22 06:45:51 -06:00
|
|
|
" {".to_owned()
|
2015-11-19 00:34:14 -06:00
|
|
|
}
|
2015-05-29 05:41:26 -05:00
|
|
|
}
|
2015-11-22 06:45:51 -06:00
|
|
|
};
|
2017-06-24 05:45:22 -05:00
|
|
|
// 1 = `}`
|
|
|
|
let overhead = if fields.is_empty() { 1 } else { 0 };
|
2017-08-29 00:29:13 -05:00
|
|
|
let total_width = result.len() + generics_str.len() + overhead;
|
|
|
|
if !generics_str.is_empty() && !generics_str.contains('\n') &&
|
|
|
|
total_width > context.config.max_width()
|
|
|
|
{
|
2017-06-24 05:45:22 -05:00
|
|
|
result.push('\n');
|
2017-07-25 04:51:14 -05:00
|
|
|
result.push_str(&offset.to_string(context.config));
|
2017-08-29 08:16:04 -05:00
|
|
|
result.push_str(generics_str.trim_left());
|
2017-06-24 05:45:22 -05:00
|
|
|
} else {
|
|
|
|
result.push_str(&generics_str);
|
|
|
|
}
|
2015-05-24 18:03:26 -05:00
|
|
|
|
2015-11-22 06:45:51 -06:00
|
|
|
if fields.is_empty() {
|
2017-08-19 13:47:40 -05:00
|
|
|
let snippet = context.snippet(mk_sp(body_lo, span.hi() - BytePos(1)));
|
2017-01-08 21:11:12 -06:00
|
|
|
if snippet.trim().is_empty() {
|
|
|
|
// `struct S {}`
|
2017-05-02 21:26:25 -05:00
|
|
|
} else if snippet.trim_right_matches(&[' ', '\t'][..]).ends_with('\n') {
|
2017-01-08 21:11:12 -06:00
|
|
|
// fix indent
|
2017-08-29 08:16:04 -05:00
|
|
|
result.push_str(snippet.trim_right());
|
2017-01-08 21:11:12 -06:00
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&offset.to_string(context.config));
|
|
|
|
} else {
|
|
|
|
result.push_str(&snippet);
|
|
|
|
}
|
|
|
|
result.push('}');
|
2015-11-22 06:45:51 -06:00
|
|
|
return Some(result);
|
2015-04-21 05:50:43 -05:00
|
|
|
}
|
|
|
|
|
2017-07-20 17:17:49 -05:00
|
|
|
// 3 = ` ` and ` }`
|
2017-08-29 01:19:56 -05:00
|
|
|
let one_line_budget = context.budget(result.len() + 3 + offset.width());
|
2017-07-25 01:19:09 -05:00
|
|
|
let one_line_budget =
|
|
|
|
one_line_width.map_or(0, |one_line_width| min(one_line_width, one_line_budget));
|
2017-07-20 17:17:49 -05:00
|
|
|
|
2017-07-03 04:54:41 -05:00
|
|
|
let items_str = try_opt!(rewrite_with_alignment(
|
|
|
|
fields,
|
|
|
|
context,
|
|
|
|
Shape::indented(offset, context.config),
|
2017-08-19 13:47:40 -05:00
|
|
|
mk_sp(body_lo, span.hi()),
|
2017-07-25 01:19:09 -05:00
|
|
|
one_line_budget,
|
2017-07-03 04:54:41 -05:00
|
|
|
));
|
2016-05-18 15:38:49 -05:00
|
|
|
|
2017-07-25 01:19:09 -05:00
|
|
|
if !items_str.contains('\n') && !result.contains('\n') && items_str.len() <= one_line_budget {
|
2016-05-18 15:38:49 -05:00
|
|
|
Some(format!("{} {} }}", result, items_str))
|
|
|
|
} else {
|
2017-06-11 22:58:58 -05:00
|
|
|
Some(format!(
|
|
|
|
"{}\n{}{}\n{}}}",
|
|
|
|
result,
|
2017-06-15 18:49:49 -05:00
|
|
|
offset
|
|
|
|
.block_indent(context.config)
|
|
|
|
.to_string(context.config),
|
2017-06-11 22:58:58 -05:00
|
|
|
items_str,
|
|
|
|
offset.to_string(context.config)
|
|
|
|
))
|
2016-05-18 15:38:49 -05:00
|
|
|
}
|
2015-11-22 06:45:51 -06:00
|
|
|
}
|
2015-04-22 23:22:48 -05:00
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
fn format_tuple_struct(
|
|
|
|
context: &RewriteContext,
|
|
|
|
item_name: &str,
|
|
|
|
ident: ast::Ident,
|
|
|
|
vis: &ast::Visibility,
|
|
|
|
fields: &[ast::StructField],
|
|
|
|
generics: Option<&ast::Generics>,
|
|
|
|
span: Span,
|
|
|
|
offset: Indent,
|
|
|
|
) -> Option<String> {
|
2015-11-22 06:45:51 -06:00
|
|
|
let mut result = String::with_capacity(1024);
|
|
|
|
|
2016-05-27 17:58:25 -05:00
|
|
|
let header_str = format_header(item_name, ident, vis);
|
2015-11-22 06:45:51 -06:00
|
|
|
result.push_str(&header_str);
|
|
|
|
|
2016-04-11 14:05:54 -05:00
|
|
|
let body_lo = if fields.is_empty() {
|
2017-04-14 06:25:47 -05:00
|
|
|
context.codemap.span_after(span, "(")
|
2016-04-11 14:05:54 -05:00
|
|
|
} else {
|
2017-08-19 13:47:40 -05:00
|
|
|
fields[0].span.lo()
|
2016-04-11 14:05:54 -05:00
|
|
|
};
|
2017-07-10 00:35:50 -05:00
|
|
|
let body_hi = if fields.is_empty() {
|
|
|
|
context.codemap.span_after(span, ")")
|
|
|
|
} else {
|
|
|
|
// This is a dirty hack to work around a missing `)` from the span of the last field.
|
|
|
|
let last_arg_span = fields[fields.len() - 1].span;
|
2017-08-29 08:16:04 -05:00
|
|
|
if context.snippet(last_arg_span).ends_with(')') {
|
2017-08-19 13:47:40 -05:00
|
|
|
last_arg_span.hi()
|
2017-07-10 00:35:50 -05:00
|
|
|
} else {
|
|
|
|
context
|
|
|
|
.codemap
|
2017-08-19 13:47:40 -05:00
|
|
|
.span_after(mk_sp(last_arg_span.hi(), span.hi()), ")")
|
2017-07-10 00:35:50 -05:00
|
|
|
}
|
|
|
|
};
|
2015-11-22 06:45:51 -06:00
|
|
|
|
2015-11-27 02:25:31 -06:00
|
|
|
let where_clause_str = match generics {
|
2016-08-23 09:14:45 -05:00
|
|
|
Some(generics) => {
|
2017-06-24 05:45:22 -05:00
|
|
|
let budget = context.budget(last_line_width(&header_str));
|
|
|
|
let shape = Shape::legacy(budget, offset);
|
2017-08-19 13:47:40 -05:00
|
|
|
let g_span = mk_sp(span.lo(), body_lo);
|
2017-06-11 09:26:49 -05:00
|
|
|
let generics_str = try_opt!(rewrite_generics(context, generics, shape, g_span));
|
2015-11-27 02:25:31 -06:00
|
|
|
result.push_str(&generics_str);
|
2015-11-22 06:45:51 -06:00
|
|
|
|
2017-06-24 05:45:22 -05:00
|
|
|
let where_budget = context.budget(last_line_width(&result));
|
2017-08-02 09:26:35 -05:00
|
|
|
let option = WhereClauseOption::new(true, false);
|
2017-06-11 22:58:58 -05:00
|
|
|
try_opt!(rewrite_where_clause(
|
|
|
|
context,
|
|
|
|
&generics.where_clause,
|
|
|
|
context.config.item_brace_style(),
|
|
|
|
Shape::legacy(where_budget, offset.block_only()),
|
|
|
|
Density::Compressed,
|
|
|
|
";",
|
|
|
|
None,
|
2017-07-10 00:35:50 -05:00
|
|
|
body_hi,
|
2017-08-02 09:26:35 -05:00
|
|
|
option,
|
2017-06-11 22:58:58 -05:00
|
|
|
))
|
2015-09-01 02:36:00 -05:00
|
|
|
}
|
2015-11-27 02:25:31 -06:00
|
|
|
None => "".to_owned(),
|
2015-11-22 06:45:51 -06:00
|
|
|
};
|
|
|
|
|
2017-04-14 06:25:47 -05:00
|
|
|
if fields.is_empty() {
|
2017-06-24 05:45:22 -05:00
|
|
|
// 3 = `();`
|
2017-08-01 08:23:12 -05:00
|
|
|
let used_width = last_line_used_width(&result, offset.width()) + 3;
|
2017-06-24 05:45:22 -05:00
|
|
|
if used_width > context.config.max_width() {
|
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&offset
|
|
|
|
.block_indent(context.config)
|
|
|
|
.to_string(context.config))
|
|
|
|
}
|
2017-03-12 17:25:46 -05:00
|
|
|
result.push('(');
|
2017-04-14 06:25:47 -05:00
|
|
|
let snippet = context.snippet(mk_sp(body_lo, context.codemap.span_before(span, ")")));
|
|
|
|
if snippet.is_empty() {
|
2017-04-14 08:39:20 -05:00
|
|
|
// `struct S ()`
|
2017-05-02 21:26:25 -05:00
|
|
|
} else if snippet.trim_right_matches(&[' ', '\t'][..]).ends_with('\n') {
|
2017-08-29 08:16:04 -05:00
|
|
|
result.push_str(snippet.trim_right());
|
2017-04-14 06:25:47 -05:00
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&offset.to_string(context.config));
|
|
|
|
} else {
|
|
|
|
result.push_str(&snippet);
|
2017-03-12 17:25:46 -05:00
|
|
|
}
|
2017-04-14 06:25:47 -05:00
|
|
|
result.push(')');
|
|
|
|
} else {
|
|
|
|
// 3 = `();`
|
2017-06-24 05:46:36 -05:00
|
|
|
let body = try_opt!(
|
|
|
|
rewrite_call_inner(
|
|
|
|
context,
|
|
|
|
"",
|
|
|
|
&fields.iter().map(|field| field).collect::<Vec<_>>()[..],
|
|
|
|
span,
|
|
|
|
Shape::legacy(context.budget(last_line_width(&result) + 3), offset),
|
|
|
|
context.config.fn_call_width(),
|
|
|
|
false,
|
|
|
|
).ok()
|
2017-06-16 04:56:32 -05:00
|
|
|
);
|
2017-06-24 05:46:36 -05:00
|
|
|
result.push_str(&body);
|
2017-03-09 20:30:47 -06:00
|
|
|
}
|
2015-11-22 06:45:51 -06:00
|
|
|
|
2015-11-25 00:39:15 -06:00
|
|
|
if !where_clause_str.is_empty() && !where_clause_str.contains('\n') &&
|
2017-06-11 22:58:58 -05:00
|
|
|
(result.contains('\n') ||
|
2017-07-19 10:35:00 -05:00
|
|
|
offset.block_indent + result.len() + where_clause_str.len() + 1 >
|
|
|
|
context.config.max_width())
|
2017-06-11 22:58:58 -05:00
|
|
|
{
|
2017-03-09 20:30:47 -06:00
|
|
|
// We need to put the where clause on a new line, but we didn't
|
2015-11-22 06:45:51 -06:00
|
|
|
// know that earlier, so the where clause will not be indented properly.
|
|
|
|
result.push('\n');
|
2017-05-16 03:47:09 -05:00
|
|
|
result.push_str(&(offset.block_only() + (context.config.tab_spaces() - 1))
|
2017-06-11 22:58:58 -05:00
|
|
|
.to_string(context.config));
|
2015-04-21 02:59:48 -05:00
|
|
|
}
|
2015-11-22 06:45:51 -06:00
|
|
|
result.push_str(&where_clause_str);
|
|
|
|
|
|
|
|
Some(result)
|
2015-09-08 13:56:33 -05:00
|
|
|
}
|
2015-04-21 02:59:48 -05:00
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
pub fn rewrite_type_alias(
|
|
|
|
context: &RewriteContext,
|
|
|
|
indent: Indent,
|
|
|
|
ident: ast::Ident,
|
|
|
|
ty: &ast::Ty,
|
|
|
|
generics: &ast::Generics,
|
|
|
|
vis: &ast::Visibility,
|
|
|
|
span: Span,
|
|
|
|
) -> Option<String> {
|
2017-08-27 10:24:10 -05:00
|
|
|
let mut result = String::with_capacity(128);
|
2015-11-22 12:21:01 -06:00
|
|
|
|
2016-08-23 09:14:45 -05:00
|
|
|
result.push_str(&format_visibility(vis));
|
2015-11-22 12:21:01 -06:00
|
|
|
result.push_str("type ");
|
|
|
|
result.push_str(&ident.to_string());
|
|
|
|
|
2017-06-11 09:26:49 -05:00
|
|
|
// 2 = `= `
|
|
|
|
let shape = try_opt!(Shape::indented(indent + result.len(), context.config).sub_width(2));
|
2017-08-19 13:47:40 -05:00
|
|
|
let g_span = mk_sp(context.codemap.span_after(span, "type"), ty.span.lo());
|
2017-06-11 09:26:49 -05:00
|
|
|
let generics_str = try_opt!(rewrite_generics(context, generics, shape, g_span));
|
2015-11-22 12:21:01 -06:00
|
|
|
result.push_str(&generics_str);
|
2015-12-02 12:39:45 -06:00
|
|
|
|
2017-08-29 01:19:56 -05:00
|
|
|
let where_budget = context.budget(last_line_width(&result));
|
2017-08-02 09:26:35 -05:00
|
|
|
let option = WhereClauseOption::snuggled(&result);
|
2017-06-11 22:58:58 -05:00
|
|
|
let where_clause_str = try_opt!(rewrite_where_clause(
|
|
|
|
context,
|
|
|
|
&generics.where_clause,
|
|
|
|
context.config.item_brace_style(),
|
|
|
|
Shape::legacy(where_budget, indent),
|
|
|
|
context.config.where_density(),
|
|
|
|
"=",
|
2017-08-19 13:47:40 -05:00
|
|
|
Some(span.hi()),
|
|
|
|
generics.span.hi(),
|
2017-08-02 09:26:35 -05:00
|
|
|
option,
|
2017-06-11 22:58:58 -05:00
|
|
|
));
|
2015-12-02 12:39:45 -06:00
|
|
|
result.push_str(&where_clause_str);
|
2017-08-02 09:27:33 -05:00
|
|
|
if where_clause_str.is_empty() {
|
|
|
|
result.push_str(" = ");
|
|
|
|
} else {
|
|
|
|
result.push_str(&format!("\n{}= ", indent.to_string(context.config)));
|
|
|
|
}
|
2015-11-22 12:21:01 -06:00
|
|
|
|
2015-11-26 14:20:04 -06:00
|
|
|
let line_width = last_line_width(&result);
|
2015-12-02 12:38:05 -06:00
|
|
|
// This checked_sub may fail as the extra space after '=' is not taken into account
|
|
|
|
// In that case the budget is set to 0 which will make ty.rewrite retry on a new line
|
2017-08-29 01:19:56 -05:00
|
|
|
let budget = context.budget(indent.width() + line_width + ";".len());
|
2015-11-26 14:20:04 -06:00
|
|
|
let type_indent = indent + line_width;
|
2015-11-22 12:21:01 -06:00
|
|
|
// Try to fit the type on the same line
|
2017-06-04 01:25:07 -05:00
|
|
|
let ty_str = try_opt!(
|
2017-02-21 21:20:50 -06:00
|
|
|
ty.rewrite(context, Shape::legacy(budget, type_indent))
|
2017-06-04 01:25:07 -05:00
|
|
|
.or_else(|| {
|
|
|
|
// The line was too short, try to put the type on the next line
|
|
|
|
|
|
|
|
// Remove the space after '='
|
|
|
|
result.pop();
|
|
|
|
let type_indent = indent.block_indent(context.config);
|
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&type_indent.to_string(context.config));
|
2017-08-29 01:19:56 -05:00
|
|
|
let budget = context.budget(type_indent.width() + ";".len());
|
2017-06-04 01:25:07 -05:00
|
|
|
ty.rewrite(context, Shape::legacy(budget, type_indent))
|
|
|
|
})
|
|
|
|
);
|
2015-11-22 12:21:01 -06:00
|
|
|
result.push_str(&ty_str);
|
|
|
|
result.push_str(";");
|
|
|
|
Some(result)
|
|
|
|
}
|
|
|
|
|
2016-09-16 18:44:51 -05:00
|
|
|
fn type_annotation_spacing(config: &Config) -> (&str, &str) {
|
2017-06-11 22:58:58 -05:00
|
|
|
(
|
|
|
|
if config.space_before_type_annotation() {
|
|
|
|
" "
|
|
|
|
} else {
|
|
|
|
""
|
|
|
|
},
|
|
|
|
if config.space_after_type_annotation_colon() {
|
|
|
|
" "
|
|
|
|
} else {
|
|
|
|
""
|
|
|
|
},
|
|
|
|
)
|
2016-08-02 20:07:56 -05:00
|
|
|
}
|
|
|
|
|
2017-07-03 04:54:41 -05:00
|
|
|
pub fn rewrite_struct_field_prefix(
|
|
|
|
context: &RewriteContext,
|
|
|
|
field: &ast::StructField,
|
|
|
|
) -> Option<String> {
|
|
|
|
let vis = format_visibility(&field.vis);
|
|
|
|
let type_annotation_spacing = type_annotation_spacing(context.config);
|
|
|
|
Some(match field.ident {
|
2017-08-11 03:52:49 -05:00
|
|
|
Some(name) => format!("{}{}{}:", vis, name, type_annotation_spacing.0),
|
|
|
|
None => format!("{}", vis),
|
2017-07-03 04:54:41 -05:00
|
|
|
})
|
|
|
|
}
|
2015-10-18 17:25:38 -05:00
|
|
|
|
2017-07-03 04:54:41 -05:00
|
|
|
fn rewrite_struct_field_type(
|
|
|
|
context: &RewriteContext,
|
|
|
|
last_line_width: usize,
|
|
|
|
field: &ast::StructField,
|
|
|
|
spacing: &str,
|
|
|
|
shape: Shape,
|
|
|
|
) -> Option<String> {
|
|
|
|
let ty_shape = try_opt!(shape.offset_left(last_line_width + spacing.len()));
|
|
|
|
field
|
|
|
|
.ty
|
|
|
|
.rewrite(context, ty_shape)
|
|
|
|
.map(|ty| format!("{}{}", spacing, ty))
|
|
|
|
}
|
2015-10-18 17:25:38 -05:00
|
|
|
|
2017-06-24 05:49:01 -05:00
|
|
|
impl Rewrite for ast::StructField {
|
|
|
|
fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
|
|
|
|
rewrite_struct_field(context, self, shape, 0)
|
|
|
|
}
|
|
|
|
}
|
2015-10-18 17:25:38 -05:00
|
|
|
|
2017-07-03 04:54:41 -05:00
|
|
|
pub fn rewrite_struct_field(
|
|
|
|
context: &RewriteContext,
|
|
|
|
field: &ast::StructField,
|
|
|
|
shape: Shape,
|
|
|
|
lhs_max_width: usize,
|
|
|
|
) -> Option<String> {
|
|
|
|
if contains_skip(&field.attrs) {
|
2017-08-19 13:47:40 -05:00
|
|
|
let span = context.snippet(mk_sp(field.attrs[0].span.lo(), field.span.hi()));
|
2017-07-03 04:54:41 -05:00
|
|
|
return wrap_str(span, context.config.max_width(), shape);
|
|
|
|
}
|
2017-03-29 06:15:27 -05:00
|
|
|
|
2017-07-03 04:54:41 -05:00
|
|
|
let type_annotation_spacing = type_annotation_spacing(context.config);
|
2017-08-11 03:52:49 -05:00
|
|
|
let prefix = try_opt!(rewrite_struct_field_prefix(context, field));
|
2017-07-03 04:54:41 -05:00
|
|
|
|
2017-08-11 03:52:49 -05:00
|
|
|
let attrs_str = try_opt!(field.attrs.rewrite(context, shape));
|
2017-08-19 13:51:24 -05:00
|
|
|
let attrs_extendable = attrs_str.is_empty() ||
|
|
|
|
(context.config.attributes_on_same_line_as_field() && is_attributes_extendable(&attrs_str));
|
2017-08-11 03:52:49 -05:00
|
|
|
let missing_span = if field.attrs.is_empty() {
|
2017-08-19 13:47:40 -05:00
|
|
|
mk_sp(field.span.lo(), field.span.lo())
|
2017-08-11 03:52:49 -05:00
|
|
|
} else {
|
2017-08-19 13:47:40 -05:00
|
|
|
mk_sp(field.attrs.last().unwrap().span.hi(), field.span.lo())
|
2017-08-11 03:52:49 -05:00
|
|
|
};
|
2017-07-03 04:54:41 -05:00
|
|
|
let mut spacing = String::from(if field.ident.is_some() {
|
|
|
|
type_annotation_spacing.1
|
|
|
|
} else {
|
|
|
|
""
|
|
|
|
});
|
2017-08-11 03:52:49 -05:00
|
|
|
// Try to put everything on a single line.
|
|
|
|
let attr_prefix = try_opt!(combine_strs_with_missing_comments(
|
|
|
|
context,
|
|
|
|
&attrs_str,
|
|
|
|
&prefix,
|
|
|
|
missing_span,
|
|
|
|
shape,
|
2017-08-19 13:51:24 -05:00
|
|
|
attrs_extendable,
|
2017-08-11 03:52:49 -05:00
|
|
|
));
|
|
|
|
let overhead = last_line_width(&attr_prefix);
|
|
|
|
let lhs_offset = lhs_max_width.checked_sub(overhead).unwrap_or(0);
|
2017-07-03 04:54:41 -05:00
|
|
|
for _ in 0..lhs_offset {
|
|
|
|
spacing.push(' ');
|
|
|
|
}
|
2017-08-11 03:52:49 -05:00
|
|
|
// In this extreme case we will be missing a space betweeen an attribute and a field.
|
2017-08-19 13:51:24 -05:00
|
|
|
if prefix.is_empty() && !attrs_str.is_empty() && attrs_extendable && spacing.is_empty() {
|
2017-08-11 03:52:49 -05:00
|
|
|
spacing.push(' ');
|
|
|
|
}
|
|
|
|
let ty_rewritten = rewrite_struct_field_type(context, overhead, field, &spacing, shape);
|
2017-07-03 04:54:41 -05:00
|
|
|
if let Some(ref ty) = ty_rewritten {
|
|
|
|
if !ty.contains('\n') {
|
2017-08-29 08:16:04 -05:00
|
|
|
return Some(attr_prefix + ty);
|
2017-07-03 04:54:41 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// We must use multiline.
|
2017-08-11 03:52:49 -05:00
|
|
|
let last_line_width = last_line_width(&prefix);
|
|
|
|
let ty_rewritten = rewrite_struct_field_type(context, last_line_width, field, &spacing, shape);
|
|
|
|
|
2017-07-03 04:54:41 -05:00
|
|
|
let type_offset = shape.indent.block_indent(context.config);
|
|
|
|
let rewrite_type_in_next_line = || {
|
|
|
|
field
|
|
|
|
.ty
|
|
|
|
.rewrite(context, Shape::indented(type_offset, context.config))
|
|
|
|
};
|
|
|
|
|
2017-08-11 03:52:49 -05:00
|
|
|
let field_str = match ty_rewritten {
|
2017-07-03 04:54:41 -05:00
|
|
|
// If we start from the next line and type fits in a single line, then do so.
|
2017-07-11 07:53:10 -05:00
|
|
|
Some(ref ty) => match rewrite_type_in_next_line() {
|
2017-08-11 03:52:49 -05:00
|
|
|
Some(ref new_ty) if !new_ty.contains('\n') => format!(
|
2017-07-11 07:53:10 -05:00
|
|
|
"{}\n{}{}",
|
|
|
|
prefix,
|
2017-08-29 08:16:04 -05:00
|
|
|
type_offset.to_string(context.config),
|
2017-07-11 07:53:10 -05:00
|
|
|
&new_ty
|
2017-08-11 03:52:49 -05:00
|
|
|
),
|
2017-08-29 08:16:04 -05:00
|
|
|
_ => prefix + ty,
|
2017-07-11 07:53:10 -05:00
|
|
|
},
|
2017-07-03 04:54:41 -05:00
|
|
|
_ => {
|
|
|
|
let ty = try_opt!(rewrite_type_in_next_line());
|
2017-08-11 03:52:49 -05:00
|
|
|
format!(
|
2017-07-03 04:54:41 -05:00
|
|
|
"{}\n{}{}",
|
|
|
|
prefix,
|
2017-08-29 08:16:04 -05:00
|
|
|
type_offset.to_string(context.config),
|
2017-07-03 04:54:41 -05:00
|
|
|
&ty
|
2017-08-11 03:52:49 -05:00
|
|
|
)
|
2017-07-03 04:54:41 -05:00
|
|
|
}
|
2017-08-11 03:52:49 -05:00
|
|
|
};
|
|
|
|
combine_strs_with_missing_comments(
|
|
|
|
context,
|
|
|
|
&attrs_str,
|
|
|
|
&field_str,
|
|
|
|
missing_span,
|
|
|
|
shape,
|
2017-08-19 13:51:24 -05:00
|
|
|
attrs_extendable,
|
2017-08-11 03:52:49 -05:00
|
|
|
)
|
2015-10-18 17:25:38 -05:00
|
|
|
}
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
pub fn rewrite_static(
|
|
|
|
prefix: &str,
|
|
|
|
vis: &ast::Visibility,
|
|
|
|
ident: ast::Ident,
|
|
|
|
ty: &ast::Ty,
|
|
|
|
mutability: ast::Mutability,
|
|
|
|
expr_opt: Option<&ptr::P<ast::Expr>>,
|
|
|
|
offset: Indent,
|
|
|
|
span: Span,
|
|
|
|
context: &RewriteContext,
|
|
|
|
) -> Option<String> {
|
2017-07-05 04:25:50 -05:00
|
|
|
let colon = colon_spaces(
|
|
|
|
context.config.space_before_type_annotation(),
|
|
|
|
context.config.space_after_type_annotation_colon(),
|
|
|
|
);
|
2017-06-11 22:58:58 -05:00
|
|
|
let prefix = format!(
|
2017-07-05 04:25:50 -05:00
|
|
|
"{}{} {}{}{}",
|
2017-06-11 22:58:58 -05:00
|
|
|
format_visibility(vis),
|
|
|
|
prefix,
|
|
|
|
format_mutability(mutability),
|
|
|
|
ident,
|
2017-07-05 04:25:50 -05:00
|
|
|
colon,
|
2017-06-11 22:58:58 -05:00
|
|
|
);
|
2015-10-18 14:25:30 -05:00
|
|
|
// 2 = " =".len()
|
2017-06-11 22:58:58 -05:00
|
|
|
let ty_str = try_opt!(ty.rewrite(
|
|
|
|
context,
|
2017-07-05 04:25:50 -05:00
|
|
|
try_opt!(
|
|
|
|
Shape::indented(offset.block_only(), context.config).offset_left(prefix.len() + 2)
|
2017-06-11 22:58:58 -05:00
|
|
|
),
|
|
|
|
));
|
2015-10-18 14:25:30 -05:00
|
|
|
|
2016-08-23 09:14:45 -05:00
|
|
|
if let Some(expr) = expr_opt {
|
2016-03-15 15:08:12 -05:00
|
|
|
let lhs = format!("{}{} =", prefix, ty_str);
|
|
|
|
// 1 = ;
|
2017-08-29 01:19:56 -05:00
|
|
|
let remaining_width = context.budget(offset.block_indent + 1);
|
2017-06-11 22:58:58 -05:00
|
|
|
rewrite_assign_rhs(
|
|
|
|
context,
|
|
|
|
lhs,
|
|
|
|
expr,
|
|
|
|
Shape::legacy(remaining_width, offset.block_only()),
|
|
|
|
).and_then(|res| {
|
2017-07-05 04:25:50 -05:00
|
|
|
recover_comment_removed(res, span, context, Shape::indented(offset, context.config))
|
2017-06-11 22:58:58 -05:00
|
|
|
})
|
2017-06-04 04:35:17 -05:00
|
|
|
.map(|s| if s.ends_with(';') { s } else { s + ";" })
|
2016-03-15 15:08:12 -05:00
|
|
|
} else {
|
2017-07-05 04:25:50 -05:00
|
|
|
Some(format!("{}{};", prefix, ty_str))
|
2016-03-15 15:08:12 -05:00
|
|
|
}
|
2015-10-18 14:25:30 -05:00
|
|
|
}
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
pub fn rewrite_associated_type(
|
|
|
|
ident: ast::Ident,
|
|
|
|
ty_opt: Option<&ptr::P<ast::Ty>>,
|
|
|
|
ty_param_bounds_opt: Option<&ast::TyParamBounds>,
|
|
|
|
context: &RewriteContext,
|
|
|
|
indent: Indent,
|
|
|
|
) -> Option<String> {
|
2016-03-15 15:08:12 -05:00
|
|
|
let prefix = format!("type {}", ident);
|
2016-03-14 20:52:07 -05:00
|
|
|
|
2017-05-23 08:13:29 -05:00
|
|
|
let type_bounds_str = if let Some(ty_param_bounds) = ty_param_bounds_opt {
|
2017-08-19 16:57:01 -05:00
|
|
|
// 2 = ": ".len()
|
|
|
|
let shape = try_opt!(Shape::indented(indent, context.config).offset_left(prefix.len() + 2));
|
2017-05-23 08:13:29 -05:00
|
|
|
let bounds: &[_] = ty_param_bounds;
|
2017-06-12 21:49:47 -05:00
|
|
|
let bound_str = try_opt!(
|
|
|
|
bounds
|
|
|
|
.iter()
|
|
|
|
.map(|ty_bound| ty_bound.rewrite(context, shape))
|
|
|
|
.collect::<Option<Vec<_>>>()
|
|
|
|
);
|
2017-08-29 08:16:04 -05:00
|
|
|
if !bounds.is_empty() {
|
2017-06-11 09:26:49 -05:00
|
|
|
format!(": {}", join_bounds(context, shape, &bound_str))
|
2016-03-14 20:52:07 -05:00
|
|
|
} else {
|
|
|
|
String::new()
|
2017-05-23 08:13:29 -05:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
String::new()
|
|
|
|
};
|
2016-03-14 20:52:07 -05:00
|
|
|
|
|
|
|
if let Some(ty) = ty_opt {
|
2017-06-11 22:58:58 -05:00
|
|
|
let ty_str = try_opt!(ty.rewrite(
|
|
|
|
context,
|
|
|
|
Shape::legacy(
|
2017-08-29 01:19:56 -05:00
|
|
|
context.budget(indent.block_indent + prefix.len() + 2),
|
2017-06-11 22:58:58 -05:00
|
|
|
indent.block_only(),
|
|
|
|
),
|
|
|
|
));
|
2017-07-27 16:27:34 -05:00
|
|
|
Some(format!("{}{} = {};", prefix, type_bounds_str, ty_str))
|
2016-03-14 20:52:07 -05:00
|
|
|
} else {
|
|
|
|
Some(format!("{}{};", prefix, type_bounds_str))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
pub fn rewrite_associated_impl_type(
|
|
|
|
ident: ast::Ident,
|
|
|
|
defaultness: ast::Defaultness,
|
|
|
|
ty_opt: Option<&ptr::P<ast::Ty>>,
|
|
|
|
ty_param_bounds_opt: Option<&ast::TyParamBounds>,
|
|
|
|
context: &RewriteContext,
|
|
|
|
indent: Indent,
|
|
|
|
) -> Option<String> {
|
|
|
|
let result = try_opt!(rewrite_associated_type(
|
|
|
|
ident,
|
|
|
|
ty_opt,
|
|
|
|
ty_param_bounds_opt,
|
|
|
|
context,
|
|
|
|
indent,
|
|
|
|
));
|
2017-02-26 15:43:49 -06:00
|
|
|
|
|
|
|
match defaultness {
|
|
|
|
ast::Defaultness::Default => Some(format!("default {}", result)),
|
|
|
|
_ => Some(result),
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-08 13:56:33 -05:00
|
|
|
impl Rewrite for ast::FunctionRetTy {
|
2017-01-30 13:28:48 -06:00
|
|
|
fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
|
2015-09-08 13:56:33 -05:00
|
|
|
match *self {
|
2016-03-01 16:27:19 -06:00
|
|
|
ast::FunctionRetTy::Default(_) => Some(String::new()),
|
|
|
|
ast::FunctionRetTy::Ty(ref ty) => {
|
2017-01-30 13:28:48 -06:00
|
|
|
let inner_width = try_opt!(shape.width.checked_sub(3));
|
2017-03-27 17:14:47 -05:00
|
|
|
ty.rewrite(context, Shape::legacy(inner_width, shape.indent + 3))
|
|
|
|
.map(|r| format!("-> {}", r))
|
2015-09-02 15:57:22 -05:00
|
|
|
}
|
2015-04-23 01:10:43 -05:00
|
|
|
}
|
2015-04-21 02:59:48 -05:00
|
|
|
}
|
2015-08-19 15:39:45 -05:00
|
|
|
}
|
2015-04-21 02:59:48 -05:00
|
|
|
|
2017-06-16 16:25:58 -05:00
|
|
|
fn is_empty_infer(context: &RewriteContext, ty: &ast::Ty) -> bool {
|
|
|
|
match ty.node {
|
|
|
|
ast::TyKind::Infer => {
|
|
|
|
let original = context.snippet(ty.span);
|
|
|
|
original != "_"
|
|
|
|
}
|
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-09-11 05:24:13 -05:00
|
|
|
impl Rewrite for ast::Arg {
|
2017-01-30 13:28:48 -06:00
|
|
|
fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
|
2015-09-11 05:24:13 -05:00
|
|
|
if is_named_arg(self) {
|
2017-06-17 02:56:54 -05:00
|
|
|
let mut result = try_opt!(
|
|
|
|
self.pat
|
|
|
|
.rewrite(context, Shape::legacy(shape.width, shape.indent))
|
|
|
|
);
|
2015-12-25 13:59:46 -06:00
|
|
|
|
2017-06-16 16:25:58 -05:00
|
|
|
if !is_empty_infer(context, &*self.ty) {
|
2017-05-16 03:47:09 -05:00
|
|
|
if context.config.space_before_type_annotation() {
|
2016-08-02 20:07:56 -05:00
|
|
|
result.push_str(" ");
|
|
|
|
}
|
2016-09-16 18:44:51 -05:00
|
|
|
result.push_str(":");
|
2017-05-16 03:47:09 -05:00
|
|
|
if context.config.space_after_type_annotation_colon() {
|
2016-09-16 18:44:51 -05:00
|
|
|
result.push_str(" ");
|
|
|
|
}
|
2017-01-30 13:28:48 -06:00
|
|
|
let max_width = try_opt!(shape.width.checked_sub(result.len()));
|
2017-06-11 22:58:58 -05:00
|
|
|
let ty_str = try_opt!(self.ty.rewrite(
|
|
|
|
context,
|
|
|
|
Shape::legacy(max_width, shape.indent + result.len()),
|
|
|
|
));
|
2015-09-11 05:24:13 -05:00
|
|
|
result.push_str(&ty_str);
|
|
|
|
}
|
2015-12-25 13:59:46 -06:00
|
|
|
|
|
|
|
Some(result)
|
2015-07-19 07:33:02 -05:00
|
|
|
} else {
|
2017-01-30 13:28:48 -06:00
|
|
|
self.ty.rewrite(context, shape)
|
2015-07-19 07:33:02 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
fn rewrite_explicit_self(
|
|
|
|
explicit_self: &ast::ExplicitSelf,
|
|
|
|
args: &[ast::Arg],
|
|
|
|
context: &RewriteContext,
|
|
|
|
) -> Option<String> {
|
2015-07-24 12:54:38 -05:00
|
|
|
match explicit_self.node {
|
2016-05-30 07:53:04 -05:00
|
|
|
ast::SelfKind::Region(lt, m) => {
|
2015-07-24 12:54:38 -05:00
|
|
|
let mut_str = format_mutability(m);
|
|
|
|
match lt {
|
2015-12-25 13:59:46 -06:00
|
|
|
Some(ref l) => {
|
2017-06-11 22:58:58 -05:00
|
|
|
let lifetime_str = try_opt!(l.rewrite(
|
|
|
|
context,
|
2017-06-13 10:06:48 -05:00
|
|
|
Shape::legacy(context.config.max_width(), Indent::empty()),
|
2017-06-11 22:58:58 -05:00
|
|
|
));
|
2015-12-25 13:59:46 -06:00
|
|
|
Some(format!("&{} {}self", lifetime_str, mut_str))
|
|
|
|
}
|
2015-07-24 12:54:38 -05:00
|
|
|
None => Some(format!("&{}self", mut_str)),
|
|
|
|
}
|
|
|
|
}
|
2016-03-01 16:27:19 -06:00
|
|
|
ast::SelfKind::Explicit(ref ty, _) => {
|
2015-12-25 12:07:51 -06:00
|
|
|
assert!(!args.is_empty(), "&[ast::Arg] shouldn't be empty.");
|
|
|
|
|
|
|
|
let mutability = explicit_self_mutability(&args[0]);
|
2017-06-11 22:58:58 -05:00
|
|
|
let type_str = try_opt!(ty.rewrite(
|
|
|
|
context,
|
2017-06-13 10:06:48 -05:00
|
|
|
Shape::legacy(context.config.max_width(), Indent::empty()),
|
2017-06-11 22:58:58 -05:00
|
|
|
));
|
|
|
|
|
|
|
|
Some(format!(
|
|
|
|
"{}self: {}",
|
|
|
|
format_mutability(mutability),
|
|
|
|
type_str
|
|
|
|
))
|
2015-07-24 12:54:38 -05:00
|
|
|
}
|
2016-03-01 16:27:19 -06:00
|
|
|
ast::SelfKind::Value(_) => {
|
2015-12-25 12:07:51 -06:00
|
|
|
assert!(!args.is_empty(), "&[ast::Arg] shouldn't be empty.");
|
2015-07-24 12:54:38 -05:00
|
|
|
|
2015-12-25 12:07:51 -06:00
|
|
|
let mutability = explicit_self_mutability(&args[0]);
|
2015-07-24 12:54:38 -05:00
|
|
|
|
2015-12-25 12:07:51 -06:00
|
|
|
Some(format!("{}self", format_mutability(mutability)))
|
2015-07-24 12:54:38 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-25 12:07:51 -06:00
|
|
|
// Hacky solution caused by absence of `Mutability` in `SelfValue` and
|
|
|
|
// `SelfExplicit` variants of `ast::ExplicitSelf_`.
|
|
|
|
fn explicit_self_mutability(arg: &ast::Arg) -> ast::Mutability {
|
2016-03-01 16:27:19 -06:00
|
|
|
if let ast::PatKind::Ident(ast::BindingMode::ByValue(mutability), _, _) = arg.pat.node {
|
2015-12-25 12:07:51 -06:00
|
|
|
mutability
|
|
|
|
} else {
|
|
|
|
unreachable!()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-08-19 15:39:45 -05:00
|
|
|
pub fn span_lo_for_arg(arg: &ast::Arg) -> BytePos {
|
2015-07-19 07:33:02 -05:00
|
|
|
if is_named_arg(arg) {
|
2017-08-19 13:47:40 -05:00
|
|
|
arg.pat.span.lo()
|
2015-07-19 07:33:02 -05:00
|
|
|
} else {
|
2017-08-19 13:47:40 -05:00
|
|
|
arg.ty.span.lo()
|
2015-07-19 07:33:02 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-16 16:25:58 -05:00
|
|
|
pub fn span_hi_for_arg(context: &RewriteContext, arg: &ast::Arg) -> BytePos {
|
2015-08-19 15:39:45 -05:00
|
|
|
match arg.ty.node {
|
2017-08-19 13:47:40 -05:00
|
|
|
ast::TyKind::Infer if context.snippet(arg.ty.span) == "_" => arg.ty.span.hi(),
|
|
|
|
ast::TyKind::Infer if is_named_arg(arg) => arg.pat.span.hi(),
|
|
|
|
_ => arg.ty.span.hi(),
|
2015-08-19 15:39:45 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-05 18:11:26 -06:00
|
|
|
pub fn is_named_arg(arg: &ast::Arg) -> bool {
|
2016-03-01 16:27:19 -06:00
|
|
|
if let ast::PatKind::Ident(_, ident, _) = arg.pat.node {
|
2016-12-23 13:13:00 -06:00
|
|
|
ident.node != symbol::keywords::Invalid.ident()
|
2015-07-19 07:33:02 -05:00
|
|
|
} else {
|
|
|
|
true
|
2015-04-20 23:47:15 -05:00
|
|
|
}
|
|
|
|
}
|
2015-04-21 05:50:43 -05:00
|
|
|
|
2015-11-22 06:45:51 -06:00
|
|
|
// Return type is (result, force_new_line_for_brace)
|
2017-06-11 22:58:58 -05:00
|
|
|
fn rewrite_fn_base(
|
|
|
|
context: &RewriteContext,
|
|
|
|
indent: Indent,
|
|
|
|
ident: ast::Ident,
|
|
|
|
fd: &ast::FnDecl,
|
|
|
|
generics: &ast::Generics,
|
|
|
|
unsafety: ast::Unsafety,
|
|
|
|
constness: ast::Constness,
|
|
|
|
defaultness: ast::Defaultness,
|
|
|
|
abi: abi::Abi,
|
|
|
|
vis: &ast::Visibility,
|
|
|
|
span: Span,
|
|
|
|
newline_brace: bool,
|
|
|
|
has_body: bool,
|
|
|
|
has_braces: bool,
|
|
|
|
) -> Option<(String, bool)> {
|
2015-11-22 06:45:51 -06:00
|
|
|
let mut force_new_line_for_brace = false;
|
|
|
|
|
|
|
|
let where_clause = &generics.where_clause;
|
|
|
|
|
|
|
|
let mut result = String::with_capacity(1024);
|
2017-08-01 08:23:12 -05:00
|
|
|
// Vis defaultness constness unsafety abi.
|
2016-05-27 17:58:25 -05:00
|
|
|
result.push_str(&*format_visibility(vis));
|
2017-08-01 08:23:12 -05:00
|
|
|
result.push_str(format_defaultness(defaultness));
|
|
|
|
result.push_str(format_constness(constness));
|
|
|
|
result.push_str(format_unsafety(unsafety));
|
2016-03-01 16:27:19 -06:00
|
|
|
if abi != abi::Abi::Rust {
|
2017-08-01 08:23:12 -05:00
|
|
|
result.push_str(&format_abi(abi, context.config.force_explicit_abi()));
|
2015-11-22 06:45:51 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
// fn foo
|
|
|
|
result.push_str("fn ");
|
|
|
|
result.push_str(&ident.to_string());
|
|
|
|
|
|
|
|
// Generics.
|
2017-06-14 06:37:54 -05:00
|
|
|
let overhead = if has_braces && !newline_brace {
|
|
|
|
// 4 = `() {`
|
|
|
|
4
|
|
|
|
} else {
|
|
|
|
// 2 = `()`
|
|
|
|
2
|
|
|
|
};
|
2017-08-01 08:23:12 -05:00
|
|
|
let used_width = last_line_used_width(&result, indent.width());
|
2017-08-29 01:19:56 -05:00
|
|
|
let one_line_budget = context.budget(used_width + overhead);
|
2017-08-01 08:23:12 -05:00
|
|
|
let shape = Shape {
|
|
|
|
width: one_line_budget,
|
|
|
|
indent: indent,
|
|
|
|
offset: used_width,
|
|
|
|
};
|
2017-08-19 13:47:40 -05:00
|
|
|
let g_span = mk_sp(span.lo(), fd.output.span().lo());
|
2017-06-11 09:26:49 -05:00
|
|
|
let generics_str = try_opt!(rewrite_generics(context, generics, shape, g_span));
|
2015-11-22 06:45:51 -06:00
|
|
|
result.push_str(&generics_str);
|
|
|
|
|
2017-06-17 02:56:54 -05:00
|
|
|
let snuggle_angle_bracket = generics_str
|
|
|
|
.lines()
|
|
|
|
.last()
|
|
|
|
.map_or(false, |l| l.trim_left().len() == 1);
|
2017-03-09 19:29:45 -06:00
|
|
|
|
2017-03-09 14:26:14 -06:00
|
|
|
// Note that the width and indent don't really matter, we'll re-layout the
|
2015-11-22 06:45:51 -06:00
|
|
|
// return type later anyway.
|
2017-06-17 02:56:54 -05:00
|
|
|
let ret_str = try_opt!(
|
|
|
|
fd.output
|
2017-08-29 08:16:04 -05:00
|
|
|
.rewrite(context, Shape::indented(indent, context.config))
|
2017-06-17 02:56:54 -05:00
|
|
|
);
|
2015-11-22 06:45:51 -06:00
|
|
|
|
|
|
|
let multi_line_ret_str = ret_str.contains('\n');
|
2016-05-29 10:58:38 -05:00
|
|
|
let ret_str_len = if multi_line_ret_str { 0 } else { ret_str.len() };
|
2015-11-22 06:45:51 -06:00
|
|
|
|
|
|
|
// Args.
|
2017-08-01 08:25:26 -05:00
|
|
|
let (one_line_budget, multi_line_budget, mut arg_indent) = try_opt!(compute_budgets_for_args(
|
|
|
|
context,
|
|
|
|
&result,
|
|
|
|
indent,
|
|
|
|
ret_str_len,
|
|
|
|
newline_brace,
|
|
|
|
has_braces,
|
|
|
|
multi_line_ret_str,
|
|
|
|
));
|
2016-04-01 18:25:35 -05:00
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
debug!(
|
|
|
|
"rewrite_fn_base: one_line_budget: {}, multi_line_budget: {}, arg_indent: {:?}",
|
|
|
|
one_line_budget,
|
|
|
|
multi_line_budget,
|
|
|
|
arg_indent
|
|
|
|
);
|
2015-11-22 06:45:51 -06:00
|
|
|
|
2017-01-25 20:44:54 -06:00
|
|
|
// Check if vertical layout was forced.
|
2015-12-01 15:09:37 -06:00
|
|
|
if one_line_budget == 0 {
|
2017-03-09 19:29:45 -06:00
|
|
|
if snuggle_angle_bracket {
|
2015-11-22 06:45:51 -06:00
|
|
|
result.push('(');
|
2017-08-29 08:16:04 -05:00
|
|
|
} else if context.config.fn_args_paren_newline() {
|
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&arg_indent.to_string(context.config));
|
|
|
|
if context.config.fn_args_layout() == IndentStyle::Visual {
|
|
|
|
arg_indent = arg_indent + 1; // extra space for `(`
|
|
|
|
}
|
|
|
|
result.push('(');
|
2015-11-22 06:45:51 -06:00
|
|
|
} else {
|
2017-08-29 08:16:04 -05:00
|
|
|
result.push_str("(");
|
|
|
|
if context.config.fn_args_layout() == IndentStyle::Visual {
|
2017-06-03 09:18:39 -05:00
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&arg_indent.to_string(context.config));
|
|
|
|
}
|
2015-11-22 06:45:51 -06:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
result.push('(');
|
2017-06-03 09:18:39 -05:00
|
|
|
}
|
2017-08-29 08:16:04 -05:00
|
|
|
if context.config.spaces_within_parens() && !fd.inputs.is_empty() && result.ends_with('(') {
|
2017-06-03 09:18:39 -05:00
|
|
|
result.push(' ')
|
2015-11-22 06:45:51 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
// A conservative estimation, to goal is to be over all parens in generics
|
2017-06-17 02:56:54 -05:00
|
|
|
let args_start = generics
|
|
|
|
.ty_params
|
|
|
|
.last()
|
2017-08-19 13:47:40 -05:00
|
|
|
.map_or(span.lo(), |tp| end_typaram(tp));
|
2017-07-10 00:35:50 -05:00
|
|
|
let args_end = if fd.inputs.is_empty() {
|
2017-08-19 13:47:40 -05:00
|
|
|
context
|
|
|
|
.codemap
|
|
|
|
.span_after(mk_sp(args_start, span.hi()), ")")
|
2017-07-10 00:35:50 -05:00
|
|
|
} else {
|
2017-08-19 13:47:40 -05:00
|
|
|
let last_span = mk_sp(fd.inputs[fd.inputs.len() - 1].span().hi(), span.hi());
|
2017-07-10 00:35:50 -05:00
|
|
|
context.codemap.span_after(last_span, ")")
|
|
|
|
};
|
2017-06-11 22:58:58 -05:00
|
|
|
let args_span = mk_sp(
|
2017-08-19 13:47:40 -05:00
|
|
|
context
|
|
|
|
.codemap
|
|
|
|
.span_after(mk_sp(args_start, span.hi()), "("),
|
2017-07-10 00:35:50 -05:00
|
|
|
args_end,
|
2017-06-11 22:58:58 -05:00
|
|
|
);
|
|
|
|
let arg_str = try_opt!(rewrite_args(
|
|
|
|
context,
|
|
|
|
&fd.inputs,
|
|
|
|
fd.get_self().as_ref(),
|
|
|
|
one_line_budget,
|
|
|
|
multi_line_budget,
|
|
|
|
indent,
|
|
|
|
arg_indent,
|
|
|
|
args_span,
|
|
|
|
fd.variadic,
|
|
|
|
generics_str.contains('\n'),
|
|
|
|
));
|
2016-04-01 18:25:35 -05:00
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
let put_args_in_block = match context.config.fn_args_layout() {
|
2017-08-01 08:25:26 -05:00
|
|
|
IndentStyle::Block => arg_str.contains('\n') || arg_str.len() > one_line_budget,
|
2017-03-12 17:25:46 -05:00
|
|
|
_ => false,
|
|
|
|
} && !fd.inputs.is_empty();
|
2016-04-01 18:25:35 -05:00
|
|
|
|
2017-05-25 23:14:36 -05:00
|
|
|
let mut args_last_line_contains_comment = false;
|
2016-04-07 14:01:16 -05:00
|
|
|
if put_args_in_block {
|
2016-04-01 18:25:35 -05:00
|
|
|
arg_indent = indent.block_indent(context.config);
|
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&arg_indent.to_string(context.config));
|
|
|
|
result.push_str(&arg_str);
|
2015-11-22 06:45:51 -06:00
|
|
|
result.push('\n');
|
2016-04-01 16:59:35 -05:00
|
|
|
result.push_str(&indent.to_string(context.config));
|
2016-04-01 18:25:35 -05:00
|
|
|
result.push(')');
|
|
|
|
} else {
|
|
|
|
result.push_str(&arg_str);
|
2017-08-01 08:25:26 -05:00
|
|
|
let used_width = last_line_used_width(&result, indent.width()) + first_line_width(&ret_str);
|
|
|
|
// Put the closing brace on the next line if it overflows the max width.
|
|
|
|
// 1 = `)`
|
2017-08-29 08:16:04 -05:00
|
|
|
if fd.inputs.is_empty() && used_width + 1 > context.config.max_width() {
|
2017-08-01 08:25:26 -05:00
|
|
|
result.push('\n');
|
|
|
|
}
|
2017-08-29 08:16:04 -05:00
|
|
|
if context.config.spaces_within_parens() && !fd.inputs.is_empty() {
|
2016-10-12 20:34:08 -05:00
|
|
|
result.push(' ')
|
|
|
|
}
|
2017-05-25 23:14:36 -05:00
|
|
|
// If the last line of args contains comment, we cannot put the closing paren
|
|
|
|
// on the same line.
|
2017-06-17 02:56:54 -05:00
|
|
|
if arg_str
|
|
|
|
.lines()
|
|
|
|
.last()
|
|
|
|
.map_or(false, |last_line| last_line.contains("//"))
|
2017-06-11 22:58:58 -05:00
|
|
|
{
|
2017-05-25 23:14:36 -05:00
|
|
|
args_last_line_contains_comment = true;
|
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&arg_indent.to_string(context.config));
|
|
|
|
}
|
2016-04-01 18:25:35 -05:00
|
|
|
result.push(')');
|
2015-11-22 06:45:51 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
// Return type.
|
2017-08-01 08:25:26 -05:00
|
|
|
if let ast::FunctionRetTy::Ty(..) = fd.output {
|
2017-05-16 03:47:09 -05:00
|
|
|
let ret_should_indent = match context.config.fn_args_layout() {
|
2016-04-07 14:47:43 -05:00
|
|
|
// If our args are block layout then we surely must have space.
|
2017-08-29 08:16:04 -05:00
|
|
|
IndentStyle::Block if put_args_in_block || fd.inputs.is_empty() => false,
|
2017-08-01 08:25:26 -05:00
|
|
|
_ if args_last_line_contains_comment => false,
|
|
|
|
_ if result.contains('\n') || multi_line_ret_str => true,
|
2016-04-07 14:01:16 -05:00
|
|
|
_ => {
|
2017-08-01 08:25:26 -05:00
|
|
|
// If the return type would push over the max width, then put the return type on
|
|
|
|
// a new line. With the +1 for the signature length an additional space between
|
|
|
|
// the closing parenthesis of the argument and the arrow '->' is considered.
|
2016-07-31 23:25:00 -05:00
|
|
|
let mut sig_length = result.len() + indent.width() + ret_str_len + 1;
|
|
|
|
|
|
|
|
// If there is no where clause, take into account the space after the return type
|
|
|
|
// and the brace.
|
|
|
|
if where_clause.predicates.is_empty() {
|
|
|
|
sig_length += 2;
|
|
|
|
}
|
|
|
|
|
2017-08-01 08:25:26 -05:00
|
|
|
sig_length > context.config.max_width()
|
2016-04-07 14:01:16 -05:00
|
|
|
}
|
|
|
|
};
|
|
|
|
let ret_indent = if ret_should_indent {
|
2017-05-16 03:47:09 -05:00
|
|
|
let indent = match context.config.fn_return_indent() {
|
2015-11-22 06:45:51 -06:00
|
|
|
ReturnIndent::WithWhereClause => indent + 4,
|
|
|
|
// Aligning with non-existent args looks silly.
|
2015-11-25 00:39:15 -06:00
|
|
|
_ if arg_str.is_empty() => {
|
2015-11-22 06:45:51 -06:00
|
|
|
force_new_line_for_brace = true;
|
|
|
|
indent + 4
|
|
|
|
}
|
|
|
|
// FIXME: we might want to check that using the arg indent
|
|
|
|
// doesn't blow our budget, and if it does, then fallback to
|
|
|
|
// the where clause indent.
|
|
|
|
_ => arg_indent,
|
|
|
|
};
|
|
|
|
|
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&indent.to_string(context.config));
|
|
|
|
indent
|
|
|
|
} else {
|
|
|
|
result.push(' ');
|
2017-06-12 02:23:10 -05:00
|
|
|
Indent::new(indent.block_indent, last_line_width(&result))
|
2015-11-22 06:45:51 -06:00
|
|
|
};
|
|
|
|
|
2017-03-09 14:26:14 -06:00
|
|
|
if multi_line_ret_str || ret_should_indent {
|
2015-11-22 06:45:51 -06:00
|
|
|
// Now that we know the proper indent and width, we need to
|
|
|
|
// re-layout the return type.
|
2017-06-17 02:56:54 -05:00
|
|
|
let ret_str = try_opt!(
|
|
|
|
fd.output
|
|
|
|
.rewrite(context, Shape::indented(ret_indent, context.config))
|
|
|
|
);
|
2015-11-22 06:45:51 -06:00
|
|
|
result.push_str(&ret_str);
|
|
|
|
} else {
|
|
|
|
result.push_str(&ret_str);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Comment between return type and the end of the decl.
|
2017-08-19 13:47:40 -05:00
|
|
|
let snippet_lo = fd.output.span().hi();
|
2015-11-22 06:45:51 -06:00
|
|
|
if where_clause.predicates.is_empty() {
|
2017-08-19 13:47:40 -05:00
|
|
|
let snippet_hi = span.hi();
|
2015-11-22 06:45:51 -06:00
|
|
|
let snippet = context.snippet(mk_sp(snippet_lo, snippet_hi));
|
2017-06-03 16:29:08 -05:00
|
|
|
// Try to preserve the layout of the original snippet.
|
2017-06-17 02:56:54 -05:00
|
|
|
let original_starts_with_newline = snippet
|
|
|
|
.find(|c| c != ' ')
|
|
|
|
.map_or(false, |i| snippet[i..].starts_with('\n'));
|
|
|
|
let original_ends_with_newline = snippet
|
|
|
|
.rfind(|c| c != ' ')
|
|
|
|
.map_or(false, |i| snippet[i..].ends_with('\n'));
|
2015-11-22 06:45:51 -06:00
|
|
|
let snippet = snippet.trim();
|
|
|
|
if !snippet.is_empty() {
|
2017-06-11 23:01:41 -05:00
|
|
|
result.push(if original_starts_with_newline {
|
|
|
|
'\n'
|
|
|
|
} else {
|
|
|
|
' '
|
|
|
|
});
|
2015-11-22 06:45:51 -06:00
|
|
|
result.push_str(snippet);
|
2017-06-03 16:29:08 -05:00
|
|
|
if original_ends_with_newline {
|
|
|
|
force_new_line_for_brace = true;
|
|
|
|
}
|
2015-11-22 06:45:51 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
let should_compress_where = match context.config.where_density() {
|
2017-08-01 08:26:22 -05:00
|
|
|
Density::Compressed => !result.contains('\n'),
|
2016-04-07 14:01:16 -05:00
|
|
|
Density::CompressedIfEmpty => !has_body && !result.contains('\n'),
|
|
|
|
_ => false,
|
2017-08-01 08:26:22 -05:00
|
|
|
};
|
2016-04-07 14:01:16 -05:00
|
|
|
|
2017-07-10 00:35:50 -05:00
|
|
|
let pos_before_where = match fd.output {
|
2017-08-19 13:47:40 -05:00
|
|
|
ast::FunctionRetTy::Default(..) => args_span.hi(),
|
|
|
|
ast::FunctionRetTy::Ty(ref ty) => ty.span.hi(),
|
2017-07-10 00:35:50 -05:00
|
|
|
};
|
2017-08-01 08:26:22 -05:00
|
|
|
|
2017-03-09 14:26:14 -06:00
|
|
|
if where_clause.predicates.len() == 1 && should_compress_where {
|
2017-08-29 01:19:56 -05:00
|
|
|
let budget = context.budget(last_line_used_width(&result, indent.width()));
|
2017-07-09 12:24:59 -05:00
|
|
|
if let Some(where_clause_str) = rewrite_where_clause(
|
|
|
|
context,
|
|
|
|
where_clause,
|
|
|
|
context.config.fn_brace_style(),
|
|
|
|
Shape::legacy(budget, indent),
|
|
|
|
Density::Compressed,
|
|
|
|
"{",
|
2017-08-19 13:47:40 -05:00
|
|
|
Some(span.hi()),
|
2017-07-10 00:35:50 -05:00
|
|
|
pos_before_where,
|
2017-08-02 09:26:35 -05:00
|
|
|
WhereClauseOption::compressed(),
|
2017-07-09 12:24:59 -05:00
|
|
|
) {
|
2017-08-01 08:26:22 -05:00
|
|
|
result.push_str(&where_clause_str);
|
|
|
|
force_new_line_for_brace |= last_line_contains_single_line_comment(&result);
|
|
|
|
return Some((result, force_new_line_for_brace));
|
2017-03-09 14:26:14 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-08-02 09:26:35 -05:00
|
|
|
let option = WhereClauseOption::new(!has_braces, put_args_in_block && ret_str.is_empty());
|
2017-06-11 22:58:58 -05:00
|
|
|
let where_clause_str = try_opt!(rewrite_where_clause(
|
|
|
|
context,
|
|
|
|
where_clause,
|
|
|
|
context.config.fn_brace_style(),
|
|
|
|
Shape::indented(indent, context.config),
|
|
|
|
Density::Tall,
|
|
|
|
"{",
|
2017-08-19 13:47:40 -05:00
|
|
|
Some(span.hi()),
|
2017-07-10 00:35:50 -05:00
|
|
|
pos_before_where,
|
2017-08-02 09:26:35 -05:00
|
|
|
option,
|
2017-06-11 22:58:58 -05:00
|
|
|
));
|
2017-08-10 09:10:41 -05:00
|
|
|
// If there are neither where clause nor return type, we may be missing comments between
|
|
|
|
// args and `{`.
|
|
|
|
if where_clause_str.is_empty() {
|
|
|
|
if let ast::FunctionRetTy::Default(ret_span) = fd.output {
|
2017-08-27 10:13:42 -05:00
|
|
|
match recover_missing_comment_in_span(
|
2017-08-19 13:47:40 -05:00
|
|
|
mk_sp(args_span.hi(), ret_span.hi()),
|
2017-08-27 10:13:42 -05:00
|
|
|
shape,
|
|
|
|
context,
|
|
|
|
last_line_width(&result),
|
|
|
|
) {
|
|
|
|
Some(ref missing_comment) if !missing_comment.is_empty() => {
|
|
|
|
result.push_str(missing_comment);
|
|
|
|
force_new_line_for_brace = true;
|
|
|
|
}
|
|
|
|
_ => (),
|
2017-08-10 09:10:41 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2016-01-10 23:06:06 -06:00
|
|
|
|
2015-11-22 06:45:51 -06:00
|
|
|
result.push_str(&where_clause_str);
|
|
|
|
|
2017-06-09 02:15:31 -05:00
|
|
|
force_new_line_for_brace |= last_line_contains_single_line_comment(&result);
|
2017-08-29 08:16:04 -05:00
|
|
|
Some((result, force_new_line_for_brace))
|
2017-06-09 02:15:31 -05:00
|
|
|
}
|
|
|
|
|
2017-08-29 08:16:04 -05:00
|
|
|
#[derive(Copy, Clone)]
|
2017-08-02 09:26:35 -05:00
|
|
|
struct WhereClauseOption {
|
|
|
|
suppress_comma: bool, // Force no trailing comma
|
|
|
|
snuggle: bool, // Do not insert newline before `where`
|
|
|
|
compress_where: bool, // Try single line where clause instead of vertical layout
|
|
|
|
}
|
|
|
|
|
|
|
|
impl WhereClauseOption {
|
|
|
|
pub fn new(suppress_comma: bool, snuggle: bool) -> WhereClauseOption {
|
|
|
|
WhereClauseOption {
|
|
|
|
suppress_comma: suppress_comma,
|
|
|
|
snuggle: snuggle,
|
|
|
|
compress_where: false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn compressed() -> WhereClauseOption {
|
|
|
|
WhereClauseOption {
|
|
|
|
suppress_comma: true,
|
|
|
|
snuggle: false,
|
|
|
|
compress_where: true,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
pub fn snuggled(current: &str) -> WhereClauseOption {
|
|
|
|
WhereClauseOption {
|
|
|
|
suppress_comma: false,
|
|
|
|
snuggle: trimmed_last_line_width(current) == 1,
|
|
|
|
compress_where: false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
fn rewrite_args(
|
|
|
|
context: &RewriteContext,
|
|
|
|
args: &[ast::Arg],
|
|
|
|
explicit_self: Option<&ast::ExplicitSelf>,
|
|
|
|
one_line_budget: usize,
|
|
|
|
multi_line_budget: usize,
|
|
|
|
indent: Indent,
|
|
|
|
arg_indent: Indent,
|
|
|
|
span: Span,
|
|
|
|
variadic: bool,
|
|
|
|
generics_str_contains_newline: bool,
|
|
|
|
) -> Option<String> {
|
|
|
|
let mut arg_item_strs = try_opt!(
|
|
|
|
args.iter()
|
|
|
|
.map(|arg| {
|
2017-08-29 08:16:04 -05:00
|
|
|
arg.rewrite(context, Shape::legacy(multi_line_budget, arg_indent))
|
2017-06-11 22:58:58 -05:00
|
|
|
})
|
|
|
|
.collect::<Option<Vec<_>>>()
|
|
|
|
);
|
2015-11-22 06:45:51 -06:00
|
|
|
|
|
|
|
// Account for sugary self.
|
|
|
|
// FIXME: the comment for the self argument is dropped. This is blocked
|
|
|
|
// on rust issue #27522.
|
2017-03-27 16:58:41 -05:00
|
|
|
let min_args = explicit_self
|
2017-06-11 22:58:58 -05:00
|
|
|
.and_then(|explicit_self| {
|
|
|
|
rewrite_explicit_self(explicit_self, args, context)
|
|
|
|
})
|
2017-03-27 16:58:41 -05:00
|
|
|
.map_or(1, |self_str| {
|
|
|
|
arg_item_strs[0] = self_str;
|
|
|
|
2
|
|
|
|
});
|
2015-11-22 06:45:51 -06:00
|
|
|
|
|
|
|
// Comments between args.
|
|
|
|
let mut arg_items = Vec::new();
|
|
|
|
if min_args == 2 {
|
|
|
|
arg_items.push(ListItem::from_str(""));
|
|
|
|
}
|
|
|
|
|
|
|
|
// FIXME(#21): if there are no args, there might still be a comment, but
|
|
|
|
// without spans for the comment or parens, there is no chance of
|
|
|
|
// getting it right. You also don't get to put a comment on self, unless
|
|
|
|
// it is explicit.
|
|
|
|
if args.len() >= min_args || variadic {
|
|
|
|
let comment_span_start = if min_args == 2 {
|
2016-03-27 06:07:28 -05:00
|
|
|
let second_arg_start = if arg_has_pattern(&args[1]) {
|
2017-08-19 13:47:40 -05:00
|
|
|
args[1].pat.span.lo()
|
2016-03-27 06:07:28 -05:00
|
|
|
} else {
|
2017-08-19 13:47:40 -05:00
|
|
|
args[1].ty.span.lo()
|
2016-03-27 06:07:28 -05:00
|
|
|
};
|
2017-08-19 13:47:40 -05:00
|
|
|
let reduced_span = mk_sp(span.lo(), second_arg_start);
|
2016-03-27 06:07:28 -05:00
|
|
|
|
2017-03-27 17:25:59 -05:00
|
|
|
context.codemap.span_after_last(reduced_span, ",")
|
2015-11-22 06:45:51 -06:00
|
|
|
} else {
|
2017-08-19 13:47:40 -05:00
|
|
|
span.lo()
|
2015-11-22 06:45:51 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
enum ArgumentKind<'a> {
|
|
|
|
Regular(&'a ast::Arg),
|
|
|
|
Variadic(BytePos),
|
|
|
|
}
|
|
|
|
|
|
|
|
let variadic_arg = if variadic {
|
2017-08-19 13:47:40 -05:00
|
|
|
let variadic_span = mk_sp(args.last().unwrap().ty.span.hi(), span.hi());
|
2017-03-27 17:25:59 -05:00
|
|
|
let variadic_start = context.codemap.span_after(variadic_span, "...") - BytePos(3);
|
2015-11-22 06:45:51 -06:00
|
|
|
Some(ArgumentKind::Variadic(variadic_start))
|
|
|
|
} else {
|
|
|
|
None
|
|
|
|
};
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
let more_items = itemize_list(
|
|
|
|
context.codemap,
|
|
|
|
args[min_args - 1..]
|
|
|
|
.iter()
|
|
|
|
.map(ArgumentKind::Regular)
|
|
|
|
.chain(variadic_arg),
|
|
|
|
")",
|
|
|
|
|arg| match *arg {
|
|
|
|
ArgumentKind::Regular(arg) => span_lo_for_arg(arg),
|
|
|
|
ArgumentKind::Variadic(start) => start,
|
|
|
|
},
|
|
|
|
|arg| match *arg {
|
2017-08-19 13:47:40 -05:00
|
|
|
ArgumentKind::Regular(arg) => arg.ty.span.hi(),
|
2017-06-11 22:58:58 -05:00
|
|
|
ArgumentKind::Variadic(start) => start + BytePos(3),
|
|
|
|
},
|
|
|
|
|arg| match *arg {
|
|
|
|
ArgumentKind::Regular(..) => None,
|
|
|
|
ArgumentKind::Variadic(..) => Some("...".to_owned()),
|
|
|
|
},
|
|
|
|
comment_span_start,
|
2017-08-19 13:47:40 -05:00
|
|
|
span.hi(),
|
2017-08-07 03:29:55 -05:00
|
|
|
false,
|
2017-06-11 22:58:58 -05:00
|
|
|
);
|
2015-11-22 06:45:51 -06:00
|
|
|
|
|
|
|
arg_items.extend(more_items);
|
|
|
|
}
|
|
|
|
|
2017-05-17 02:31:09 -05:00
|
|
|
let fits_in_one_line = !generics_str_contains_newline &&
|
2017-08-29 08:16:04 -05:00
|
|
|
(arg_items.is_empty() || arg_items.len() == 1 && arg_item_strs[0].len() <= one_line_budget);
|
2017-05-17 02:31:09 -05:00
|
|
|
|
2015-11-22 06:45:51 -06:00
|
|
|
for (item, arg) in arg_items.iter_mut().zip(arg_item_strs) {
|
|
|
|
item.item = Some(arg);
|
|
|
|
}
|
|
|
|
|
2017-05-26 17:33:06 -05:00
|
|
|
let last_line_ends_with_comment = arg_items
|
|
|
|
.iter()
|
|
|
|
.last()
|
|
|
|
.and_then(|item| item.post_comment.as_ref())
|
|
|
|
.map_or(false, |s| s.trim().starts_with("//"));
|
|
|
|
|
2017-07-13 06:32:46 -05:00
|
|
|
let (indent, trailing_comma) = match context.config.fn_args_layout() {
|
|
|
|
IndentStyle::Block if fits_in_one_line => {
|
|
|
|
(indent.block_indent(context.config), SeparatorTactic::Never)
|
|
|
|
}
|
2017-07-11 07:53:10 -05:00
|
|
|
IndentStyle::Block => (
|
|
|
|
indent.block_indent(context.config),
|
|
|
|
context.config.trailing_comma(),
|
|
|
|
),
|
2017-05-26 17:33:06 -05:00
|
|
|
IndentStyle::Visual if last_line_ends_with_comment => {
|
2017-07-13 06:32:46 -05:00
|
|
|
(arg_indent, context.config.trailing_comma())
|
2017-05-26 17:33:06 -05:00
|
|
|
}
|
2017-07-13 06:32:46 -05:00
|
|
|
IndentStyle::Visual => (arg_indent, SeparatorTactic::Never),
|
2015-11-22 06:45:51 -06:00
|
|
|
};
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
let tactic = definitive_tactic(
|
|
|
|
&arg_items,
|
|
|
|
context.config.fn_args_density().to_list_tactic(),
|
2017-07-31 02:23:42 -05:00
|
|
|
Separator::Comma,
|
2017-06-11 22:58:58 -05:00
|
|
|
one_line_budget,
|
|
|
|
);
|
2015-11-22 06:45:51 -06:00
|
|
|
let budget = match tactic {
|
|
|
|
DefinitiveListTactic::Horizontal => one_line_budget,
|
|
|
|
_ => multi_line_budget,
|
|
|
|
};
|
|
|
|
|
2016-04-07 14:24:30 -05:00
|
|
|
debug!("rewrite_args: budget: {}, tactic: {:?}", budget, tactic);
|
|
|
|
|
2015-11-22 06:45:51 -06:00
|
|
|
let fmt = ListFormatting {
|
|
|
|
tactic: tactic,
|
|
|
|
separator: ",",
|
2017-06-03 01:01:04 -05:00
|
|
|
trailing_separator: if variadic {
|
|
|
|
SeparatorTactic::Never
|
|
|
|
} else {
|
|
|
|
trailing_comma
|
|
|
|
},
|
2017-08-18 09:19:47 -05:00
|
|
|
separator_place: SeparatorPlace::Back,
|
2017-01-30 13:28:48 -06:00
|
|
|
shape: Shape::legacy(budget, indent),
|
2017-07-13 06:32:46 -05:00
|
|
|
ends_with_newline: tactic.ends_with_newline(context.config.fn_args_layout()),
|
2017-07-26 08:43:36 -05:00
|
|
|
preserve_newline: true,
|
2015-11-22 06:45:51 -06:00
|
|
|
config: context.config,
|
|
|
|
};
|
|
|
|
|
|
|
|
write_list(&arg_items, &fmt)
|
|
|
|
}
|
|
|
|
|
2016-03-27 06:07:28 -05:00
|
|
|
fn arg_has_pattern(arg: &ast::Arg) -> bool {
|
2016-12-23 13:13:00 -06:00
|
|
|
if let ast::PatKind::Ident(_, ident, _) = arg.pat.node {
|
|
|
|
ident.node != symbol::keywords::Invalid.ident()
|
2016-03-27 06:07:28 -05:00
|
|
|
} else {
|
|
|
|
true
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
fn compute_budgets_for_args(
|
|
|
|
context: &RewriteContext,
|
|
|
|
result: &str,
|
|
|
|
indent: Indent,
|
|
|
|
ret_str_len: usize,
|
|
|
|
newline_brace: bool,
|
|
|
|
has_braces: bool,
|
2017-08-01 08:25:26 -05:00
|
|
|
force_vertical_layout: bool,
|
2017-06-11 22:58:58 -05:00
|
|
|
) -> Option<((usize, usize, Indent))> {
|
|
|
|
debug!(
|
|
|
|
"compute_budgets_for_args {} {:?}, {}, {}",
|
|
|
|
result.len(),
|
|
|
|
indent,
|
|
|
|
ret_str_len,
|
|
|
|
newline_brace
|
|
|
|
);
|
2015-12-01 15:09:37 -06:00
|
|
|
// Try keeping everything on the same line.
|
2017-08-01 08:25:26 -05:00
|
|
|
if !result.contains('\n') && !force_vertical_layout {
|
2017-05-25 08:55:11 -05:00
|
|
|
// 2 = `()`, 3 = `() `, space is before ret_string.
|
|
|
|
let overhead = if ret_str_len == 0 { 2 } else { 3 };
|
|
|
|
let mut used_space = indent.width() + result.len() + ret_str_len + overhead;
|
|
|
|
if has_braces {
|
|
|
|
if !newline_brace {
|
|
|
|
// 2 = `{}`
|
|
|
|
used_space += 2;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
// 1 = `;`
|
|
|
|
used_space += 1;
|
2015-11-22 06:45:51 -06:00
|
|
|
}
|
2017-08-29 01:19:56 -05:00
|
|
|
let one_line_budget = context.budget(used_space);
|
2015-12-01 15:09:37 -06:00
|
|
|
|
|
|
|
if one_line_budget > 0 {
|
2016-05-26 18:49:26 -05:00
|
|
|
// 4 = "() {".len()
|
2017-08-01 08:25:26 -05:00
|
|
|
let (indent, multi_line_budget) = match context.config.fn_args_layout() {
|
|
|
|
IndentStyle::Block => {
|
|
|
|
let indent = indent.block_indent(context.config);
|
2017-08-29 01:19:56 -05:00
|
|
|
(indent, context.budget(indent.width() + 1))
|
2017-08-01 08:25:26 -05:00
|
|
|
}
|
|
|
|
IndentStyle::Visual => {
|
|
|
|
let indent = indent + result.len() + 1;
|
2017-08-27 00:57:21 -05:00
|
|
|
let multi_line_overhead = indent.width() + if newline_brace { 2 } else { 4 };
|
2017-08-29 01:19:56 -05:00
|
|
|
(indent, context.budget(multi_line_overhead))
|
2017-08-01 08:25:26 -05:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
return Some((one_line_budget, multi_line_budget, indent));
|
2015-11-22 06:45:51 -06:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Didn't work. we must force vertical layout and put args on a newline.
|
|
|
|
let new_indent = indent.block_indent(context.config);
|
2017-08-01 08:25:26 -05:00
|
|
|
let used_space = match context.config.fn_args_layout() {
|
|
|
|
// 1 = `,`
|
|
|
|
IndentStyle::Block => new_indent.width() + 1,
|
|
|
|
// Account for `)` and possibly ` {`.
|
|
|
|
IndentStyle::Visual => new_indent.width() + if ret_str_len == 0 { 1 } else { 3 },
|
|
|
|
};
|
2017-08-29 01:19:56 -05:00
|
|
|
Some((0, context.budget(used_space), new_indent))
|
2015-11-22 06:45:51 -06:00
|
|
|
}
|
|
|
|
|
2017-08-01 08:25:26 -05:00
|
|
|
fn newline_for_brace(config: &Config, where_clause: &ast::WhereClause, has_body: bool) -> bool {
|
|
|
|
match (config.fn_brace_style(), config.where_density()) {
|
|
|
|
(BraceStyle::AlwaysNextLine, _) => true,
|
|
|
|
(_, Density::Compressed) if where_clause.predicates.len() == 1 => false,
|
|
|
|
(_, Density::CompressedIfEmpty) if where_clause.predicates.len() == 1 && !has_body => false,
|
|
|
|
(BraceStyle::SameLineWhere, _) if !where_clause.predicates.is_empty() => true,
|
2015-11-22 06:45:51 -06:00
|
|
|
_ => false,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-12 21:49:47 -05:00
|
|
|
fn rewrite_generics(
|
|
|
|
context: &RewriteContext,
|
|
|
|
generics: &ast::Generics,
|
|
|
|
shape: Shape,
|
|
|
|
span: Span,
|
|
|
|
) -> Option<String> {
|
2017-06-17 12:00:58 -05:00
|
|
|
let g_shape = try_opt!(generics_shape_from_config(context.config, shape, 0));
|
2017-06-24 05:46:36 -05:00
|
|
|
let one_line_width = shape.width.checked_sub(2).unwrap_or(0);
|
2017-06-17 12:00:58 -05:00
|
|
|
rewrite_generics_inner(context, generics, g_shape, one_line_width, span).or_else(|| {
|
|
|
|
rewrite_generics_inner(context, generics, g_shape, 0, span)
|
|
|
|
})
|
2017-06-11 09:26:49 -05:00
|
|
|
}
|
|
|
|
|
2017-06-12 21:49:47 -05:00
|
|
|
fn rewrite_generics_inner(
|
|
|
|
context: &RewriteContext,
|
|
|
|
generics: &ast::Generics,
|
|
|
|
shape: Shape,
|
|
|
|
one_line_width: usize,
|
|
|
|
span: Span,
|
|
|
|
) -> Option<String> {
|
2015-11-22 06:45:51 -06:00
|
|
|
// FIXME: convert bounds to where clauses where they get too big or if
|
|
|
|
// there is a where clause at all.
|
|
|
|
let lifetimes: &[_] = &generics.lifetimes;
|
|
|
|
let tys: &[_] = &generics.ty_params;
|
|
|
|
if lifetimes.is_empty() && tys.is_empty() {
|
|
|
|
return Some(String::new());
|
|
|
|
}
|
|
|
|
|
|
|
|
// Strings for the generics.
|
2017-06-10 05:45:23 -05:00
|
|
|
let lt_strs = lifetimes.iter().map(|lt| lt.rewrite(context, shape));
|
|
|
|
let ty_strs = tys.iter().map(|ty_param| ty_param.rewrite(context, shape));
|
2015-11-22 06:45:51 -06:00
|
|
|
|
|
|
|
// Extract comments between generics.
|
2017-05-16 09:24:38 -05:00
|
|
|
let lt_spans = lifetimes.iter().map(|l| {
|
2017-06-11 22:58:58 -05:00
|
|
|
let hi = if l.bounds.is_empty() {
|
2017-08-19 13:47:40 -05:00
|
|
|
l.lifetime.span.hi()
|
2017-06-11 22:58:58 -05:00
|
|
|
} else {
|
2017-08-19 13:47:40 -05:00
|
|
|
l.bounds[l.bounds.len() - 1].span.hi()
|
2017-06-11 22:58:58 -05:00
|
|
|
};
|
2017-08-19 13:47:40 -05:00
|
|
|
mk_sp(l.lifetime.span.lo(), hi)
|
2017-06-11 22:58:58 -05:00
|
|
|
});
|
2017-07-10 00:35:50 -05:00
|
|
|
let ty_spans = tys.iter().map(|ty| ty.span());
|
2015-11-22 06:45:51 -06:00
|
|
|
|
2017-06-12 21:49:47 -05:00
|
|
|
let items = itemize_list(
|
|
|
|
context.codemap,
|
|
|
|
lt_spans.chain(ty_spans).zip(lt_strs.chain(ty_strs)),
|
|
|
|
">",
|
2017-08-19 13:47:40 -05:00
|
|
|
|&(sp, _)| sp.lo(),
|
|
|
|
|&(sp, _)| sp.hi(),
|
2017-06-12 21:49:47 -05:00
|
|
|
// FIXME: don't clone
|
|
|
|
|&(_, ref str)| str.clone(),
|
|
|
|
context.codemap.span_after(span, "<"),
|
2017-08-19 13:47:40 -05:00
|
|
|
span.hi(),
|
2017-08-07 03:29:55 -05:00
|
|
|
false,
|
2017-06-12 21:49:47 -05:00
|
|
|
);
|
2017-06-10 05:45:23 -05:00
|
|
|
format_generics_item_list(context, items, shape, one_line_width)
|
2017-06-10 04:24:23 -05:00
|
|
|
}
|
2015-11-22 06:45:51 -06:00
|
|
|
|
2017-06-17 12:00:58 -05:00
|
|
|
pub fn generics_shape_from_config(config: &Config, shape: Shape, offset: usize) -> Option<Shape> {
|
|
|
|
match config.generics_indent() {
|
|
|
|
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)
|
|
|
|
}
|
2017-06-10 04:24:23 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-06-12 21:49:47 -05:00
|
|
|
pub fn format_generics_item_list<I>(
|
|
|
|
context: &RewriteContext,
|
|
|
|
items: I,
|
|
|
|
shape: Shape,
|
|
|
|
one_line_budget: usize,
|
|
|
|
) -> Option<String>
|
|
|
|
where
|
|
|
|
I: Iterator<Item = ListItem>,
|
2017-06-10 04:24:23 -05:00
|
|
|
{
|
|
|
|
let item_vec = items.collect::<Vec<_>>();
|
2015-11-22 06:45:51 -06:00
|
|
|
|
2017-07-29 08:12:18 -05:00
|
|
|
let tactic = definitive_tactic(
|
|
|
|
&item_vec,
|
|
|
|
ListTactic::HorizontalVertical,
|
2017-07-31 02:23:42 -05:00
|
|
|
Separator::Comma,
|
2017-07-29 08:12:18 -05:00
|
|
|
one_line_budget,
|
|
|
|
);
|
2017-06-10 04:24:23 -05:00
|
|
|
let fmt = ListFormatting {
|
2017-06-24 05:46:36 -05:00
|
|
|
tactic: tactic,
|
2017-06-10 04:24:23 -05:00
|
|
|
separator: ",",
|
|
|
|
trailing_separator: if context.config.generics_indent() == IndentStyle::Visual {
|
|
|
|
SeparatorTactic::Never
|
|
|
|
} else {
|
|
|
|
context.config.trailing_comma()
|
|
|
|
},
|
2017-08-18 09:19:47 -05:00
|
|
|
separator_place: SeparatorPlace::Back,
|
2017-06-10 04:24:23 -05:00
|
|
|
shape: shape,
|
2017-07-13 06:32:46 -05:00
|
|
|
ends_with_newline: tactic.ends_with_newline(context.config.generics_indent()),
|
2017-07-26 08:43:36 -05:00
|
|
|
preserve_newline: true,
|
2017-06-10 04:24:23 -05:00
|
|
|
config: context.config,
|
|
|
|
};
|
|
|
|
|
|
|
|
let list_str = try_opt!(write_list(&item_vec, &fmt));
|
|
|
|
|
2017-06-12 21:49:47 -05:00
|
|
|
Some(wrap_generics_with_angle_brackets(
|
|
|
|
context,
|
|
|
|
&list_str,
|
|
|
|
shape.indent,
|
|
|
|
))
|
2017-06-10 04:24:23 -05:00
|
|
|
}
|
|
|
|
|
2017-06-12 21:49:47 -05:00
|
|
|
pub fn wrap_generics_with_angle_brackets(
|
|
|
|
context: &RewriteContext,
|
|
|
|
list_str: &str,
|
|
|
|
list_offset: Indent,
|
|
|
|
) -> String {
|
2017-06-10 04:24:23 -05:00
|
|
|
if context.config.generics_indent() == IndentStyle::Block &&
|
2017-06-12 21:49:47 -05:00
|
|
|
(list_str.contains('\n') || list_str.ends_with(','))
|
|
|
|
{
|
|
|
|
format!(
|
|
|
|
"<\n{}{}\n{}>",
|
|
|
|
list_offset.to_string(context.config),
|
|
|
|
list_str,
|
2017-06-15 18:49:49 -05:00
|
|
|
list_offset
|
|
|
|
.block_unindent(context.config)
|
|
|
|
.to_string(context.config)
|
2017-06-12 21:49:47 -05:00
|
|
|
)
|
2017-05-16 03:47:09 -05:00
|
|
|
} else if context.config.spaces_within_angle_brackets() {
|
2017-03-09 19:29:45 -06:00
|
|
|
format!("< {} >", list_str)
|
|
|
|
} else {
|
|
|
|
format!("<{}>", list_str)
|
2017-06-10 04:24:23 -05:00
|
|
|
}
|
2015-11-22 06:45:51 -06:00
|
|
|
}
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
fn rewrite_trait_bounds(
|
|
|
|
context: &RewriteContext,
|
|
|
|
type_param_bounds: &ast::TyParamBounds,
|
|
|
|
shape: Shape,
|
|
|
|
) -> Option<String> {
|
2016-08-23 09:14:45 -05:00
|
|
|
let bounds: &[_] = type_param_bounds;
|
2016-03-11 15:18:30 -06:00
|
|
|
|
|
|
|
if bounds.is_empty() {
|
|
|
|
return Some(String::new());
|
|
|
|
}
|
2017-06-12 21:49:47 -05:00
|
|
|
let bound_str = try_opt!(
|
|
|
|
bounds
|
|
|
|
.iter()
|
2017-08-29 08:16:04 -05:00
|
|
|
.map(|ty_bound| ty_bound.rewrite(context, shape))
|
2017-06-12 21:49:47 -05:00
|
|
|
.collect::<Option<Vec<_>>>()
|
|
|
|
);
|
2017-06-11 09:26:49 -05:00
|
|
|
Some(format!(": {}", join_bounds(context, shape, &bound_str)))
|
2016-03-11 15:18:30 -06:00
|
|
|
}
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
fn rewrite_where_clause_rfc_style(
|
|
|
|
context: &RewriteContext,
|
|
|
|
where_clause: &ast::WhereClause,
|
|
|
|
shape: Shape,
|
|
|
|
terminator: &str,
|
|
|
|
span_end: Option<BytePos>,
|
2017-07-10 00:35:50 -05:00
|
|
|
span_end_before_where: BytePos,
|
2017-08-02 09:26:35 -05:00
|
|
|
where_clause_option: WhereClauseOption,
|
2017-06-11 22:58:58 -05:00
|
|
|
) -> Option<String> {
|
2017-06-17 12:00:58 -05:00
|
|
|
let block_shape = shape.block().with_max_width(context.config);
|
2017-03-08 19:21:20 -06:00
|
|
|
|
2017-07-10 00:35:50 -05:00
|
|
|
let (span_before, span_after) =
|
2017-08-01 04:36:36 -05:00
|
|
|
missing_span_before_after_where(span_end_before_where, where_clause);
|
2017-07-10 00:35:50 -05:00
|
|
|
let (comment_before, comment_after) = try_opt!(rewrite_comments_before_after_where(
|
|
|
|
context,
|
|
|
|
span_before,
|
|
|
|
span_after,
|
|
|
|
shape,
|
|
|
|
));
|
|
|
|
|
2017-08-02 09:26:35 -05:00
|
|
|
let starting_newline = if where_clause_option.snuggle && comment_before.is_empty() {
|
2017-03-08 19:21:20 -06:00
|
|
|
" ".to_owned()
|
|
|
|
} else {
|
|
|
|
"\n".to_owned() + &block_shape.indent.to_string(context.config)
|
|
|
|
};
|
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
let clause_shape = block_shape.block_indent(context.config.tab_spaces());
|
2017-03-08 19:21:20 -06:00
|
|
|
// each clause on one line, trailing comma (except if suppress_comma)
|
2017-08-19 13:47:40 -05:00
|
|
|
let span_start = where_clause.predicates[0].span().lo();
|
2017-03-08 19:21:20 -06:00
|
|
|
// If we don't have the start of the next span, then use the end of the
|
|
|
|
// predicates, but that means we miss comments.
|
|
|
|
let len = where_clause.predicates.len();
|
2017-08-19 13:47:40 -05:00
|
|
|
let end_of_preds = where_clause.predicates[len - 1].span().hi();
|
2017-03-08 19:21:20 -06:00
|
|
|
let span_end = span_end.unwrap_or(end_of_preds);
|
2017-06-12 21:49:47 -05:00
|
|
|
let items = itemize_list(
|
|
|
|
context.codemap,
|
|
|
|
where_clause.predicates.iter(),
|
|
|
|
terminator,
|
2017-08-19 13:47:40 -05:00
|
|
|
|pred| pred.span().lo(),
|
|
|
|
|pred| pred.span().hi(),
|
2017-06-17 12:00:58 -05:00
|
|
|
|pred| pred.rewrite(context, block_shape),
|
2017-06-12 21:49:47 -05:00
|
|
|
span_start,
|
|
|
|
span_end,
|
2017-08-07 03:29:55 -05:00
|
|
|
false,
|
2017-06-12 21:49:47 -05:00
|
|
|
);
|
2017-08-02 09:26:35 -05:00
|
|
|
let comma_tactic = if where_clause_option.suppress_comma {
|
2017-03-08 19:21:20 -06:00
|
|
|
SeparatorTactic::Never
|
|
|
|
} else {
|
2017-06-19 02:00:04 -05:00
|
|
|
context.config.trailing_comma()
|
2017-03-08 19:21:20 -06:00
|
|
|
};
|
|
|
|
|
|
|
|
let fmt = ListFormatting {
|
|
|
|
tactic: DefinitiveListTactic::Vertical,
|
|
|
|
separator: ",",
|
|
|
|
trailing_separator: comma_tactic,
|
2017-08-18 09:19:47 -05:00
|
|
|
separator_place: SeparatorPlace::Back,
|
2017-03-08 19:21:20 -06:00
|
|
|
shape: clause_shape,
|
|
|
|
ends_with_newline: true,
|
2017-07-26 08:43:36 -05:00
|
|
|
preserve_newline: true,
|
2017-03-08 19:21:20 -06:00
|
|
|
config: context.config,
|
|
|
|
};
|
2017-07-05 09:12:58 -05:00
|
|
|
let preds_str = try_opt!(write_list(&items.collect::<Vec<_>>(), &fmt));
|
2017-03-08 19:21:20 -06:00
|
|
|
|
2017-08-02 09:27:19 -05:00
|
|
|
let comment_separator = |comment: &str, shape: Shape| if comment.is_empty() {
|
2017-07-10 00:35:50 -05:00
|
|
|
String::new()
|
|
|
|
} else {
|
2017-08-02 09:27:19 -05:00
|
|
|
format!("\n{}", shape.indent.to_string(context.config))
|
2017-07-10 00:35:50 -05:00
|
|
|
};
|
2017-08-02 09:27:19 -05:00
|
|
|
let newline_before_where = comment_separator(&comment_before, shape);
|
|
|
|
let newline_after_where = comment_separator(&comment_after, clause_shape);
|
|
|
|
|
2017-08-02 09:26:35 -05:00
|
|
|
// 6 = `where `
|
|
|
|
let clause_sep = if where_clause_option.compress_where && comment_before.is_empty() &&
|
|
|
|
comment_after.is_empty() && !preds_str.contains('\n') &&
|
|
|
|
6 + preds_str.len() <= shape.width
|
2017-08-01 08:26:22 -05:00
|
|
|
{
|
|
|
|
String::from(" ")
|
|
|
|
} else {
|
|
|
|
format!("\n{}", clause_shape.indent.to_string(context.config))
|
|
|
|
};
|
2017-06-11 22:58:58 -05:00
|
|
|
Some(format!(
|
2017-08-01 08:26:22 -05:00
|
|
|
"{}{}{}where{}{}{}{}",
|
2017-06-11 22:58:58 -05:00
|
|
|
starting_newline,
|
2017-07-10 00:35:50 -05:00
|
|
|
comment_before,
|
|
|
|
newline_before_where,
|
|
|
|
newline_after_where,
|
|
|
|
comment_after,
|
2017-08-01 08:26:22 -05:00
|
|
|
clause_sep,
|
2017-06-11 22:58:58 -05:00
|
|
|
preds_str
|
|
|
|
))
|
2017-03-08 19:21:20 -06:00
|
|
|
}
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
fn rewrite_where_clause(
|
|
|
|
context: &RewriteContext,
|
|
|
|
where_clause: &ast::WhereClause,
|
|
|
|
brace_style: BraceStyle,
|
|
|
|
shape: Shape,
|
|
|
|
density: Density,
|
|
|
|
terminator: &str,
|
|
|
|
span_end: Option<BytePos>,
|
2017-07-10 00:35:50 -05:00
|
|
|
span_end_before_where: BytePos,
|
2017-08-02 09:26:35 -05:00
|
|
|
where_clause_option: WhereClauseOption,
|
2017-06-11 22:58:58 -05:00
|
|
|
) -> Option<String> {
|
2015-11-22 06:45:51 -06:00
|
|
|
if where_clause.predicates.is_empty() {
|
|
|
|
return Some(String::new());
|
|
|
|
}
|
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
if context.config.where_style() == Style::Rfc {
|
2017-06-11 22:58:58 -05:00
|
|
|
return rewrite_where_clause_rfc_style(
|
|
|
|
context,
|
|
|
|
where_clause,
|
|
|
|
shape,
|
|
|
|
terminator,
|
|
|
|
span_end,
|
2017-07-10 00:35:50 -05:00
|
|
|
span_end_before_where,
|
2017-08-02 09:26:35 -05:00
|
|
|
where_clause_option,
|
2017-06-11 22:58:58 -05:00
|
|
|
);
|
2017-03-08 19:21:20 -06:00
|
|
|
}
|
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
let extra_indent = Indent::new(context.config.tab_spaces(), 0);
|
2015-11-22 06:45:51 -06:00
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
let offset = match context.config.where_pred_indent() {
|
2017-03-19 17:42:20 -05:00
|
|
|
IndentStyle::Block => shape.indent + extra_indent.block_indent(context.config),
|
2015-11-22 06:45:51 -06:00
|
|
|
// 6 = "where ".len()
|
2017-03-19 17:42:20 -05:00
|
|
|
IndentStyle::Visual => shape.indent + extra_indent + 6,
|
2015-11-22 06:45:51 -06:00
|
|
|
};
|
|
|
|
// FIXME: if where_pred_indent != Visual, then the budgets below might
|
|
|
|
// be out by a char or two.
|
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
let budget = context.config.max_width() - offset.width();
|
2017-08-19 13:47:40 -05:00
|
|
|
let span_start = where_clause.predicates[0].span().lo();
|
2015-11-22 06:45:51 -06:00
|
|
|
// If we don't have the start of the next span, then use the end of the
|
|
|
|
// predicates, but that means we miss comments.
|
|
|
|
let len = where_clause.predicates.len();
|
2017-08-19 13:47:40 -05:00
|
|
|
let end_of_preds = where_clause.predicates[len - 1].span().hi();
|
2015-11-22 06:45:51 -06:00
|
|
|
let span_end = span_end.unwrap_or(end_of_preds);
|
2017-06-11 22:58:58 -05:00
|
|
|
let items = itemize_list(
|
|
|
|
context.codemap,
|
|
|
|
where_clause.predicates.iter(),
|
|
|
|
terminator,
|
2017-08-19 13:47:40 -05:00
|
|
|
|pred| pred.span().lo(),
|
|
|
|
|pred| pred.span().hi(),
|
2017-06-11 22:58:58 -05:00
|
|
|
|pred| pred.rewrite(context, Shape::legacy(budget, offset)),
|
|
|
|
span_start,
|
|
|
|
span_end,
|
2017-08-07 03:29:55 -05:00
|
|
|
false,
|
2017-06-11 22:58:58 -05:00
|
|
|
);
|
2015-11-22 06:45:51 -06:00
|
|
|
let item_vec = items.collect::<Vec<_>>();
|
|
|
|
// FIXME: we don't need to collect here if the where_layout isn't
|
|
|
|
// HorizontalVertical.
|
2017-07-31 02:23:42 -05:00
|
|
|
let tactic = definitive_tactic(
|
|
|
|
&item_vec,
|
|
|
|
context.config.where_layout(),
|
|
|
|
Separator::Comma,
|
|
|
|
budget,
|
|
|
|
);
|
2017-02-23 15:31:23 -06:00
|
|
|
|
2017-05-16 03:47:09 -05:00
|
|
|
let mut comma_tactic = context.config.trailing_comma();
|
2017-02-23 15:31:23 -06:00
|
|
|
// Kind of a hack because we don't usually have trailing commas in where clauses.
|
2017-08-02 09:26:35 -05:00
|
|
|
if comma_tactic == SeparatorTactic::Vertical || where_clause_option.suppress_comma {
|
2017-02-23 15:31:23 -06:00
|
|
|
comma_tactic = SeparatorTactic::Never;
|
|
|
|
}
|
2015-11-22 06:45:51 -06:00
|
|
|
|
|
|
|
let fmt = ListFormatting {
|
|
|
|
tactic: tactic,
|
|
|
|
separator: ",",
|
2017-02-23 15:31:23 -06:00
|
|
|
trailing_separator: comma_tactic,
|
2017-08-18 09:19:47 -05:00
|
|
|
separator_place: SeparatorPlace::Back,
|
2017-01-30 13:28:48 -06:00
|
|
|
shape: Shape::legacy(budget, offset),
|
2017-07-13 06:32:46 -05:00
|
|
|
ends_with_newline: tactic.ends_with_newline(context.config.where_pred_indent()),
|
2017-07-26 08:43:36 -05:00
|
|
|
preserve_newline: true,
|
2015-11-22 06:45:51 -06:00
|
|
|
config: context.config,
|
|
|
|
};
|
|
|
|
let preds_str = try_opt!(write_list(&item_vec, &fmt));
|
|
|
|
|
2015-11-28 06:59:14 -06:00
|
|
|
let end_length = if terminator == "{" {
|
|
|
|
// If the brace is on the next line we don't need to count it otherwise it needs two
|
|
|
|
// characters " {"
|
2015-12-01 12:51:49 -06:00
|
|
|
match brace_style {
|
2017-07-09 12:24:59 -05:00
|
|
|
BraceStyle::AlwaysNextLine | BraceStyle::SameLineWhere => 0,
|
2016-08-23 09:14:45 -05:00
|
|
|
BraceStyle::PreferSameLine => 2,
|
2015-11-28 06:59:14 -06:00
|
|
|
}
|
2015-12-02 12:38:05 -06:00
|
|
|
} else if terminator == "=" {
|
|
|
|
2
|
2015-11-27 02:25:31 -06:00
|
|
|
} else {
|
2015-11-28 06:59:14 -06:00
|
|
|
terminator.len()
|
2015-11-27 02:25:31 -06:00
|
|
|
};
|
2015-11-22 06:45:51 -06:00
|
|
|
if density == Density::Tall || preds_str.contains('\n') ||
|
2017-06-11 22:58:58 -05:00
|
|
|
shape.indent.width() + " where ".len() + preds_str.len() + end_length > shape.width
|
|
|
|
{
|
|
|
|
Some(format!(
|
|
|
|
"\n{}where {}",
|
|
|
|
(shape.indent + extra_indent).to_string(context.config),
|
|
|
|
preds_str
|
|
|
|
))
|
2015-11-22 06:45:51 -06:00
|
|
|
} else {
|
|
|
|
Some(format!(" where {}", preds_str))
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-07-10 00:35:50 -05:00
|
|
|
fn missing_span_before_after_where(
|
|
|
|
before_item_span_end: BytePos,
|
|
|
|
where_clause: &ast::WhereClause,
|
|
|
|
) -> (Span, Span) {
|
2017-08-19 13:47:40 -05:00
|
|
|
let missing_span_before = mk_sp(before_item_span_end, where_clause.span.lo());
|
2017-07-10 00:35:50 -05:00
|
|
|
// 5 = `where`
|
2017-08-19 13:47:40 -05:00
|
|
|
let pos_after_where = where_clause.span.lo() + BytePos(5);
|
|
|
|
let missing_span_after = mk_sp(pos_after_where, where_clause.predicates[0].span().lo());
|
2017-07-10 00:35:50 -05:00
|
|
|
(missing_span_before, missing_span_after)
|
|
|
|
}
|
|
|
|
|
|
|
|
fn rewrite_comments_before_after_where(
|
|
|
|
context: &RewriteContext,
|
|
|
|
span_before_where: Span,
|
|
|
|
span_after_where: Span,
|
|
|
|
shape: Shape,
|
|
|
|
) -> Option<(String, String)> {
|
2017-08-27 10:13:42 -05:00
|
|
|
let before_comment = try_opt!(rewrite_missing_comment(span_before_where, shape, context));
|
|
|
|
let after_comment = try_opt!(rewrite_missing_comment(
|
|
|
|
span_after_where,
|
2017-07-10 00:35:50 -05:00
|
|
|
shape.block_indent(context.config.tab_spaces()),
|
2017-08-27 10:13:42 -05:00
|
|
|
context,
|
2017-07-10 00:35:50 -05:00
|
|
|
));
|
|
|
|
Some((before_comment, after_comment))
|
|
|
|
}
|
|
|
|
|
2016-05-27 17:58:25 -05:00
|
|
|
fn format_header(item_name: &str, ident: ast::Ident, vis: &ast::Visibility) -> String {
|
|
|
|
format!("{}{}{}", format_visibility(vis), item_name, ident)
|
2015-11-22 06:45:51 -06:00
|
|
|
}
|
|
|
|
|
2017-06-11 22:58:58 -05:00
|
|
|
fn format_generics(
|
|
|
|
context: &RewriteContext,
|
|
|
|
generics: &ast::Generics,
|
|
|
|
opener: &str,
|
|
|
|
terminator: &str,
|
|
|
|
brace_style: BraceStyle,
|
|
|
|
force_same_line_brace: bool,
|
|
|
|
offset: Indent,
|
|
|
|
span: Span,
|
2017-06-24 05:46:36 -05:00
|
|
|
used_width: usize,
|
2017-06-11 22:58:58 -05:00
|
|
|
) -> Option<String> {
|
2017-06-24 05:46:36 -05:00
|
|
|
let shape = Shape::legacy(context.budget(used_width + offset.width()), offset);
|
2017-04-19 08:48:45 -05:00
|
|
|
let mut result = try_opt!(rewrite_generics(context, generics, shape, span));
|
2015-11-22 06:45:51 -06:00
|
|
|
|
2017-07-26 02:30:58 -05:00
|
|
|
let same_line_brace = if !generics.where_clause.predicates.is_empty() || result.contains('\n') {
|
2017-08-29 01:19:56 -05:00
|
|
|
let budget = context.budget(last_line_used_width(&result, offset.width()));
|
2017-08-02 09:26:35 -05:00
|
|
|
let option = WhereClauseOption::snuggled(&result);
|
2017-06-11 22:58:58 -05:00
|
|
|
let where_clause_str = try_opt!(rewrite_where_clause(
|
|
|
|
context,
|
|
|
|
&generics.where_clause,
|
|
|
|
brace_style,
|
|
|
|
Shape::legacy(budget, offset.block_only()),
|
|
|
|
Density::Tall,
|
|
|
|
terminator,
|
2017-08-19 13:47:40 -05:00
|
|
|
Some(span.hi()),
|
|
|
|
generics.span.hi(),
|
2017-08-02 09:26:35 -05:00
|
|
|
option,
|
2017-06-11 22:58:58 -05:00
|
|
|
));
|
2015-11-22 06:45:51 -06:00
|
|
|
result.push_str(&where_clause_str);
|
2017-07-25 04:51:14 -05:00
|
|
|
force_same_line_brace || brace_style == BraceStyle::PreferSameLine ||
|
|
|
|
(generics.where_clause.predicates.is_empty() && trimmed_last_line_width(&result) == 1)
|
2015-11-22 06:45:51 -06:00
|
|
|
} else {
|
2017-07-25 04:51:14 -05:00
|
|
|
force_same_line_brace || trimmed_last_line_width(&result) == 1 ||
|
2017-06-11 22:58:58 -05:00
|
|
|
brace_style != BraceStyle::AlwaysNextLine
|
2017-07-25 04:51:14 -05:00
|
|
|
};
|
2017-08-01 08:23:12 -05:00
|
|
|
let total_used_width = last_line_used_width(&result, used_width);
|
2017-08-29 01:19:56 -05:00
|
|
|
let remaining_budget = context.budget(total_used_width);
|
2017-07-25 04:51:14 -05:00
|
|
|
// If the same line brace if forced, it indicates that we are rewriting an item with empty body,
|
|
|
|
// and hence we take the closer into account as well for one line budget.
|
|
|
|
// We assume that the closer has the same length as the opener.
|
|
|
|
let overhead = if force_same_line_brace {
|
|
|
|
1 + opener.len() + opener.len()
|
|
|
|
} else {
|
|
|
|
1 + opener.len()
|
|
|
|
};
|
|
|
|
let forbid_same_line_brace = overhead > remaining_budget;
|
|
|
|
if !forbid_same_line_brace && same_line_brace {
|
|
|
|
result.push(' ');
|
|
|
|
} else {
|
|
|
|
result.push('\n');
|
|
|
|
result.push_str(&offset.block_only().to_string(context.config));
|
2015-11-22 06:45:51 -06:00
|
|
|
}
|
2017-07-25 04:51:14 -05:00
|
|
|
result.push_str(opener);
|
2015-11-22 06:45:51 -06:00
|
|
|
|
|
|
|
Some(result)
|
|
|
|
}
|
2017-08-24 18:19:51 -05:00
|
|
|
|
|
|
|
impl Rewrite for ast::ForeignItem {
|
|
|
|
fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
|
|
|
|
let attrs_str = try_opt!(self.attrs.rewrite(context, shape));
|
|
|
|
// Drop semicolon or it will be interpreted as comment.
|
|
|
|
// FIXME: this may be a faulty span from libsyntax.
|
2017-08-19 13:47:40 -05:00
|
|
|
let span = mk_sp(self.span.lo(), self.span.hi() - BytePos(1));
|
2017-08-24 18:19:51 -05:00
|
|
|
|
|
|
|
let item_str = try_opt!(match self.node {
|
|
|
|
ast::ForeignItemKind::Fn(ref fn_decl, ref generics) => {
|
|
|
|
rewrite_fn_base(
|
|
|
|
context,
|
|
|
|
shape.indent,
|
|
|
|
self.ident,
|
|
|
|
fn_decl,
|
|
|
|
generics,
|
|
|
|
ast::Unsafety::Normal,
|
|
|
|
ast::Constness::NotConst,
|
|
|
|
ast::Defaultness::Final,
|
|
|
|
// These are not actually rust functions,
|
|
|
|
// but we format them as such.
|
|
|
|
abi::Abi::Rust,
|
|
|
|
&self.vis,
|
|
|
|
span,
|
|
|
|
false,
|
|
|
|
false,
|
|
|
|
false,
|
|
|
|
).map(|(s, _)| format!("{};", s))
|
|
|
|
}
|
|
|
|
ast::ForeignItemKind::Static(ref ty, is_mutable) => {
|
|
|
|
// FIXME(#21): we're dropping potential comments in between the
|
|
|
|
// function keywords here.
|
|
|
|
let vis = format_visibility(&self.vis);
|
|
|
|
let mut_str = if is_mutable { "mut " } else { "" };
|
|
|
|
let prefix = format!("{}static {}{}:", vis, mut_str, self.ident);
|
|
|
|
// 1 = ;
|
|
|
|
let shape = try_opt!(shape.sub_width(1));
|
|
|
|
ty.rewrite(context, shape).map(|ty_str| {
|
|
|
|
// 1 = space between prefix and type.
|
|
|
|
let sep = if prefix.len() + ty_str.len() + 1 <= shape.width {
|
|
|
|
String::from(" ")
|
|
|
|
} else {
|
|
|
|
let nested_indent = shape.indent.block_indent(context.config);
|
|
|
|
format!("\n{}", nested_indent.to_string(context.config))
|
|
|
|
};
|
|
|
|
format!("{}{}{};", prefix, sep, ty_str)
|
|
|
|
})
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
let missing_span = if self.attrs.is_empty() {
|
2017-08-19 13:47:40 -05:00
|
|
|
mk_sp(self.span.lo(), self.span.lo())
|
2017-08-24 18:19:51 -05:00
|
|
|
} else {
|
2017-08-19 13:47:40 -05:00
|
|
|
mk_sp(self.attrs[self.attrs.len() - 1].span.hi(), self.span.lo())
|
2017-08-24 18:19:51 -05:00
|
|
|
};
|
|
|
|
combine_strs_with_missing_comments(
|
|
|
|
context,
|
|
|
|
&attrs_str,
|
|
|
|
&item_str,
|
|
|
|
missing_span,
|
|
|
|
shape,
|
|
|
|
false,
|
|
|
|
)
|
|
|
|
}
|
|
|
|
}
|