// Formatting top-level items - functions, structs, enums, traits, impls.
use std::borrow::Cow;
-use std::cmp::{min, Ordering};
+use std::cmp::{max, min, Ordering};
use regex::Regex;
use rustc_target::spec::abi;
use syntax::visit;
use syntax::{ast, ptr, symbol};
+use crate::attr::filter_inline_attrs;
use crate::comment::{
combine_strs_with_missing_comments, contains_comment, is_last_comment_block,
recover_comment_removed, recover_missing_comment_in_span, rewrite_missing_comment,
FindUncommented,
};
use crate::config::lists::*;
-use crate::config::{BraceStyle, Config, Density, IndentStyle, Version};
+use crate::config::{BraceStyle, Config, IndentStyle, Version};
use crate::expr::{
- format_expr, is_empty_block, is_simple_block_stmt, rewrite_assign_rhs, rewrite_assign_rhs_with,
- ExprType, RhsTactics,
+ is_empty_block, is_simple_block_stmt, rewrite_assign_rhs, rewrite_assign_rhs_with, RhsTactics,
};
use crate::lists::{definitive_tactic, itemize_list, write_list, ListFormatting, Separator};
use crate::macros::{rewrite_macro, MacroPosition};
use crate::shape::{Indent, Shape};
use crate::source_map::{LineRangeUtils, SpanUtils};
use crate::spanned::Spanned;
+use crate::stmt::Stmt;
use crate::utils::*;
use crate::vertical::rewrite_with_alignment;
use crate::visitor::FmtVisitor;
decl: &'a ast::FnDecl,
generics: &'a ast::Generics,
abi: abi::Abi,
- is_async: ast::IsAsync,
+ is_async: Cow<'a, ast::IsAsync>,
constness: ast::Constness,
defaultness: ast::Defaultness,
unsafety: ast::Unsafety,
decl,
generics,
abi: abi::Abi::Rust,
- is_async: ast::IsAsync::NotAsync,
+ is_async: Cow::Owned(ast::IsAsync::NotAsync),
constness: ast::Constness::NotConst,
defaultness: ast::Defaultness::Final,
unsafety: ast::Unsafety::Normal,
) -> FnSig<'a> {
FnSig {
unsafety: method_sig.header.unsafety,
- is_async: method_sig.header.asyncness.node,
+ is_async: Cow::Borrowed(&method_sig.header.asyncness.node),
constness: method_sig.header.constness.node,
defaultness: ast::Defaultness::Final,
abi: method_sig.header.abi,
generics,
abi: fn_header.abi,
constness: fn_header.constness.node,
- is_async: fn_header.asyncness.node,
+ is_async: Cow::Borrowed(&fn_header.asyncness.node),
defaultness,
unsafety: fn_header.unsafety,
visibility: visibility.clone(),
result.push_str(&*format_visibility(context, &self.visibility));
result.push_str(format_defaultness(self.defaultness));
result.push_str(format_constness(self.constness));
+ result.push_str(format_async(&self.is_async));
result.push_str(format_unsafety(self.unsafety));
- result.push_str(format_async(self.is_async));
result.push_str(&format_abi(
self.abi,
context.config.force_explicit_abi(),
self.last_pos = item.span.hi();
}
- pub(crate) fn rewrite_fn(
+ pub(crate) fn rewrite_fn_before_block(
&mut self,
indent: Indent,
ident: ast::Ident,
fn_sig: &FnSig<'_>,
span: Span,
- block: &ast::Block,
- inner_attrs: Option<&[ast::Attribute]>,
- ) -> Option<String> {
+ ) -> Option<(String, FnBraceStyle)> {
let context = self.get_context();
- let mut newline_brace = newline_for_brace(self.config, &fn_sig.generics.where_clause);
-
- let (mut result, force_newline_brace) =
- rewrite_fn_base(&context, indent, ident, fn_sig, span, newline_brace, true)?;
+ let mut fn_brace_style = newline_for_brace(self.config, &fn_sig.generics.where_clause);
+ let (result, force_newline_brace) =
+ rewrite_fn_base(&context, indent, ident, fn_sig, span, fn_brace_style)?;
// 2 = ` {`
if self.config.brace_style() == BraceStyle::AlwaysNextLine
|| force_newline_brace
|| last_line_width(&result) + 2 > self.shape().width
{
- newline_brace = true;
- } else if !result.contains('\n') {
- newline_brace = false;
+ fn_brace_style = FnBraceStyle::NextLine
}
- if let rw @ Some(..) = self.single_line_fn(&result, block, inner_attrs) {
- rw
- } else {
- // 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.
- if newline_brace {
- result.push_str(&indent.to_string_with_newline(self.config));
- } else {
- result.push(' ');
- }
- Some(result)
- }
+ Some((result, fn_brace_style))
}
pub(crate) fn rewrite_required_fn(
ident,
&FnSig::from_method_sig(sig, generics),
span,
- false,
- false,
+ FnBraceStyle::None,
)?;
// Re-attach semicolon
Some(result)
}
- fn single_line_fn(
+ pub(crate) fn single_line_fn(
&self,
fn_str: &str,
block: &ast::Block,
return None;
}
- let stmt = block.stmts.first()?;
- let res = match stmt_expr(stmt) {
- Some(e) => {
- let suffix = if semicolon_for_expr(&self.get_context(), e) {
- ";"
- } else {
- ""
- };
-
- format_expr(e, ExprType::Statement, &self.get_context(), self.shape())
- .map(|s| s + suffix)?
- }
- None => stmt.rewrite(&self.get_context(), self.shape())?,
- };
+ let res = Stmt::from_ast_node(block.stmts.first()?, true)
+ .rewrite(&self.get_context(), self.shape())?;
let width = self.block_indent.width() + fn_str.len() + res.len() + 5;
if !res.contains('\n') && width <= self.config.max_width() {
}
pub(crate) fn visit_struct(&mut self, struct_parts: &StructParts<'_>) {
- let is_tuple = struct_parts.def.is_tuple();
+ let is_tuple = match struct_parts.def {
+ ast::VariantData::Tuple(..) => true,
+ _ => false,
+ };
let rewrite = format_struct(&self.get_context(), struct_parts, self.block_indent, None)
.map(|s| if is_tuple { s + ";" } else { s });
self.push_rewrite(struct_parts.span, rewrite);
let discr_ident_lens: Vec<usize> = enum_def
.variants
.iter()
- .filter(|var| var.node.disr_expr.is_some())
- .map(|var| rewrite_ident(&self.get_context(), var.node.ident).len())
+ .filter(|var| var.disr_expr.is_some())
+ .map(|var| rewrite_ident(&self.get_context(), var.ident).len())
.collect();
// cut the list at the point of longest discrim shorter than the threshold
// All of the discrims under the threshold will get padded, and all above - left as is.
"}",
",",
|f| {
- if !f.node.attrs.is_empty() {
- f.node.attrs[0].span.lo()
+ if !f.attrs.is_empty() {
+ f.attrs[0].span.lo()
} else {
f.span.lo()
}
one_line_width: usize,
pad_discrim_ident_to: usize,
) -> Option<String> {
- if contains_skip(&field.node.attrs) {
- let lo = field.node.attrs[0].span.lo();
+ if contains_skip(&field.attrs) {
+ let lo = field.attrs[0].span.lo();
let span = mk_sp(lo, field.span.hi());
return Some(self.snippet(span).to_owned());
}
let context = self.get_context();
// 1 = ','
let shape = self.shape().sub_width(1)?;
- let attrs_str = field.node.attrs.rewrite(&context, shape)?;
+ let attrs_str = field.attrs.rewrite(&context, shape)?;
let lo = field
- .node
.attrs
.last()
.map_or(field.span.lo(), |attr| attr.span.hi());
let span = mk_sp(lo, field.span.lo());
- let variant_body = match field.node.data {
+ let variant_body = match field.data {
ast::VariantData::Tuple(..) | ast::VariantData::Struct(..) => format_struct(
&context,
&StructParts::from_variant(field),
self.block_indent,
Some(one_line_width),
)?,
- ast::VariantData::Unit(..) => {
- if let Some(ref expr) = field.node.disr_expr {
- let lhs = format!(
- "{:1$} =",
- rewrite_ident(&context, field.node.ident),
- pad_discrim_ident_to
- );
- rewrite_assign_rhs_with(
- &context,
- lhs,
- &*expr.value,
- shape,
- RhsTactics::AllowOverflow,
- )?
- } else {
- rewrite_ident(&context, field.node.ident).to_owned()
- }
- }
+ ast::VariantData::Unit(..) => rewrite_ident(&context, field.ident).to_owned(),
+ };
+
+ let variant_body = if let Some(ref expr) = field.disr_expr {
+ let lhs = format!("{:1$} =", variant_body, pad_discrim_ident_to);
+ rewrite_assign_rhs_with(
+ &context,
+ lhs,
+ &*expr.value,
+ shape,
+ RhsTactics::AllowOverflow,
+ )?
+ } else {
+ variant_body
};
combine_strs_with_missing_comments(&context, &attrs_str, &variant_body, span, shape, false)
buffer.push((self.buffer.clone(), item.clone()));
self.buffer.clear();
}
- // type -> existential -> const -> macro -> method
+ // type -> opaque -> const -> macro -> method
use crate::ast::ImplItemKind::*;
fn need_empty_line(a: &ast::ImplItemKind, b: &ast::ImplItemKind) -> bool {
match (a, b) {
- (Type(..), Type(..))
+ (TyAlias(..), TyAlias(..))
| (Const(..), Const(..))
- | (Existential(..), Existential(..)) => false,
+ | (OpaqueTy(..), OpaqueTy(..)) => false,
_ => true,
}
}
- buffer.sort_by(|(_, a), (_, b)| match (&a.node, &b.node) {
- (Type(..), Type(..))
+ buffer.sort_by(|(_, a), (_, b)| match (&a.kind, &b.kind) {
+ (TyAlias(..), TyAlias(..))
| (Const(..), Const(..))
| (Macro(..), Macro(..))
- | (Existential(..), Existential(..)) => a.ident.as_str().cmp(&b.ident.as_str()),
+ | (OpaqueTy(..), OpaqueTy(..)) => a.ident.as_str().cmp(&b.ident.as_str()),
(Method(..), Method(..)) => a.span.lo().cmp(&b.span.lo()),
- (Type(..), _) => Ordering::Less,
- (_, Type(..)) => Ordering::Greater,
- (Existential(..), _) => Ordering::Less,
- (_, Existential(..)) => Ordering::Greater,
+ (TyAlias(..), _) => Ordering::Less,
+ (_, TyAlias(..)) => Ordering::Greater,
+ (OpaqueTy(..), _) => Ordering::Less,
+ (_, OpaqueTy(..)) => Ordering::Greater,
(Const(..), _) => Ordering::Less,
(_, Const(..)) => Ordering::Greater,
(Macro(..), _) => Ordering::Less,
// different impl items.
if prev_kind
.as_ref()
- .map_or(false, |prev_kind| need_empty_line(prev_kind, &item.node))
+ .map_or(false, |prev_kind| need_empty_line(prev_kind, &item.kind))
{
self.push_str("\n");
}
let indent_str = self.block_indent.to_string_with_newline(self.config);
self.push_str(&indent_str);
self.push_str(buf.trim());
- prev_kind = Some(item.node.clone());
+ prev_kind = Some(item.kind.clone());
}
} else {
for item in items {
item: &ast::Item,
offset: Indent,
) -> Option<String> {
- if let ast::ItemKind::Impl(_, _, _, ref generics, _, ref self_ty, ref items) = item.node {
+ if let ast::ItemKind::Impl(_, _, _, ref generics, _, ref self_ty, ref items) = item.kind {
let mut result = String::with_capacity(128);
let ref_and_type = format_impl_ref_and_type(context, item, offset)?;
let sep = offset.to_string_with_newline(context.config);
{
option.suppress_comma();
option.snuggle();
- option.compress_where();
+ option.allow_single_line();
}
- let misssing_span = mk_sp(self_ty.span.hi(), item.span.hi());
- let where_span_end = context.snippet_provider.opt_span_before(misssing_span, "{");
+ let missing_span = mk_sp(self_ty.span.hi(), item.span.hi());
+ let where_span_end = context.snippet_provider.opt_span_before(missing_span, "{");
let where_clause_str = rewrite_where_clause(
context,
&generics.where_clause,
context.config.brace_style(),
Shape::legacy(where_budget, offset.block_only()),
- Density::Vertical,
+ false,
"{",
where_span_end,
self_ty.span.hi(),
option,
- false,
)?;
// If there is no where-clause, we may have missing comments between the trait name and
}
result.push('{');
-
- let snippet = context.snippet(item.span);
+ // this is an impl body snippet(impl SampleImpl { /* here */ })
+ let lo = max(self_ty.span.hi(), generics.where_clause.span.hi());
+ let snippet = context.snippet(mk_sp(lo, item.span.hi()));
let open_pos = snippet.find_uncommented("{")? + 1;
if !items.is_empty() || contains_comment(&snippet[open_pos..]) {
let mut visitor = FmtVisitor::from_context(context);
let item_indent = offset.block_only().block_indent(context.config);
visitor.block_indent = item_indent;
- visitor.last_pos = item.span.lo() + BytePos(open_pos as u32);
+ visitor.last_pos = lo + BytePos(open_pos as u32);
visitor.visit_attrs(&item.attrs, ast::AttrStyle::Inner);
visitor.visit_impl_items(items);
ref trait_ref,
ref self_ty,
_,
- ) = item.node
+ ) = item.kind
{
let mut result = String::with_capacity(128);
fn from_variant(variant: &'a ast::Variant) -> Self {
StructParts {
prefix: "",
- ident: variant.node.ident,
+ ident: variant.ident,
vis: &DEFAULT_VISIBILITY,
- def: &variant.node.data,
+ def: &variant.data,
generics: None,
span: variant.span,
}
}
pub(crate) fn from_item(item: &'a ast::Item) -> Self {
- let (prefix, def, generics) = match item.node {
+ let (prefix, def, generics) = match item.kind {
ast::ItemKind::Struct(ref def, ref generics) => ("struct ", def, generics),
ast::ItemKind::Union(ref def, ref generics) => ("union ", def, generics),
_ => unreachable!(),
ref generics,
ref generic_bounds,
ref trait_items,
- ) = item.node
+ ) = item.kind
{
let mut result = String::with_capacity(128);
let header = format!(
// Rewrite where-clause.
if !generics.where_clause.predicates.is_empty() {
- let where_density = if context.config.indent_style() == IndentStyle::Block {
- Density::Compressed
- } else {
- Density::Tall
- };
+ let where_on_new_line = context.config.indent_style() != IndentStyle::Block;
let where_budget = context.budget(last_line_width(&result));
let pos_before_where = if generic_bounds.is_empty() {
&generics.where_clause,
context.config.brace_style(),
Shape::legacy(where_budget, offset.block_only()),
- where_density,
+ where_on_new_line,
"{",
None,
pos_before_where,
option,
- false,
)?;
// If the where-clause cannot fit on the same line,
// put the where-clause on a new line
}
}
+struct OpaqueTypeBounds<'a> {
+ generic_bounds: &'a ast::GenericBounds,
+}
+
+impl<'a> Rewrite for OpaqueTypeBounds<'a> {
+ fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
+ self.generic_bounds
+ .rewrite(context, shape)
+ .map(|s| format!("impl {}", s))
+ }
+}
+
+pub(crate) struct TraitAliasBounds<'a> {
+ generic_bounds: &'a ast::GenericBounds,
+ generics: &'a ast::Generics,
+}
+
+impl<'a> Rewrite for TraitAliasBounds<'a> {
+ fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
+ let generic_bounds_str = self.generic_bounds.rewrite(context, shape)?;
+
+ let mut option = WhereClauseOption::new(true, WhereClauseSpace::None);
+ option.allow_single_line();
+
+ let where_str = rewrite_where_clause(
+ context,
+ &self.generics.where_clause,
+ context.config.brace_style(),
+ shape,
+ false,
+ ";",
+ None,
+ self.generics.where_clause.span.lo(),
+ option,
+ )?;
+
+ let fits_single_line = !generic_bounds_str.contains('\n')
+ && !where_str.contains('\n')
+ && generic_bounds_str.len() + where_str.len() + 1 <= shape.width;
+ let space = if generic_bounds_str.is_empty() || where_str.is_empty() {
+ Cow::from("")
+ } else if fits_single_line {
+ Cow::from(" ")
+ } else {
+ shape.indent.to_string_with_newline(&context.config)
+ };
+
+ Some(format!("{}{}{}", generic_bounds_str, space, where_str))
+ }
+}
+
pub(crate) fn format_trait_alias(
context: &RewriteContext<'_>,
ident: ast::Ident,
let vis_str = format_visibility(context, vis);
let lhs = format!("{}trait {} =", vis_str, generics_str);
// 1 = ";"
- rewrite_assign_rhs(context, lhs, generic_bounds, shape.sub_width(1)?).map(|s| s + ";")
+ let trait_alias_bounds = TraitAliasBounds {
+ generics,
+ generic_bounds,
+ };
+ rewrite_assign_rhs(context, lhs, &trait_alias_bounds, shape.sub_width(1)?).map(|s| s + ";")
}
fn format_unit_struct(
result.push_str(&generics_str);
let where_budget = context.budget(last_line_width(&result));
- let option = WhereClauseOption::new(true, false);
+ let option = WhereClauseOption::new(true, WhereClauseSpace::Newline);
rewrite_where_clause(
context,
&generics.where_clause,
context.config.brace_style(),
Shape::legacy(where_budget, offset.block_only()),
- Density::Compressed,
+ false,
";",
None,
body_hi,
option,
- false,
)?
}
None => "".to_owned(),
&generics.where_clause,
context.config.brace_style(),
Shape::legacy(where_budget, indent),
- Density::Vertical,
+ false,
"=",
None,
generics.span.hi(),
option,
- false,
)?;
result.push_str(&where_clause_str);
rewrite_type_item(context, indent, "type", " =", ident, ty, generics, vis)
}
-pub(crate) fn rewrite_existential_type(
+pub(crate) fn rewrite_opaque_type(
context: &RewriteContext<'_>,
indent: Indent,
ident: ast::Ident,
generics: &ast::Generics,
vis: &ast::Visibility,
) -> Option<String> {
+ let opaque_type_bounds = OpaqueTypeBounds { generic_bounds };
rewrite_type_item(
context,
indent,
- "existential type",
- ":",
+ "type",
+ " =",
ident,
- generic_bounds,
+ &opaque_type_bounds,
generics,
vis,
)
impl<'a> StaticParts<'a> {
pub(crate) fn from_item(item: &'a ast::Item) -> Self {
- let (prefix, ty, mutability, expr) = match item.node {
+ let (prefix, ty, mutability, expr) = match item.kind {
ast::ItemKind::Static(ref ty, mutability, ref expr) => ("static", ty, mutability, expr),
ast::ItemKind::Const(ref ty, ref expr) => {
("const", ty, ast::Mutability::Immutable, expr)
}
pub(crate) fn from_trait_item(ti: &'a ast::TraitItem) -> Self {
- let (ty, expr_opt) = match ti.node {
+ let (ty, expr_opt) = match ti.kind {
ast::TraitItemKind::Const(ref ty, ref expr_opt) => (ty, expr_opt),
_ => unreachable!(),
};
}
pub(crate) fn from_impl_item(ii: &'a ast::ImplItem) -> Self {
- let (ty, expr) = match ii.node {
+ let (ty, expr) = match ii.kind {
ast::ImplItemKind::Const(ref ty, ref expr) => (ty, expr),
_ => unreachable!(),
};
}
}
-pub(crate) fn rewrite_existential_impl_type(
+struct OpaqueType<'a> {
+ bounds: &'a ast::GenericBounds,
+}
+
+impl<'a> Rewrite for OpaqueType<'a> {
+ fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
+ let shape = shape.offset_left(5)?; // `impl `
+ self.bounds
+ .rewrite(context, shape)
+ .map(|s| format!("impl {}", s))
+ }
+}
+
+pub(crate) fn rewrite_opaque_impl_type(
context: &RewriteContext<'_>,
ident: ast::Ident,
generics: &ast::Generics,
generic_bounds: &ast::GenericBounds,
indent: Indent,
) -> Option<String> {
- rewrite_associated_type(ident, None, generics, Some(generic_bounds), context, indent)
- .map(|s| format!("existential {}", s))
+ let ident_str = rewrite_ident(context, ident);
+ // 5 = "type "
+ let generics_shape = Shape::indented(indent, context.config).offset_left(5)?;
+ let generics_str = rewrite_generics(context, ident_str, generics, generics_shape)?;
+ let prefix = format!("type {} =", generics_str);
+ let rhs = OpaqueType {
+ bounds: generic_bounds,
+ };
+
+ rewrite_assign_rhs(
+ context,
+ &prefix,
+ &rhs,
+ Shape::indented(indent, context.config).sub_width(1)?,
+ )
+ .map(|s| s + ";")
}
pub(crate) fn rewrite_associated_impl_type(
match *self {
ast::FunctionRetTy::Default(_) => Some(String::new()),
ast::FunctionRetTy::Ty(ref ty) => {
- let inner_width = shape.width.checked_sub(3)?;
- ty.rewrite(context, Shape::legacy(inner_width, shape.indent + 3))
- .map(|r| format!("-> {}", r))
+ if context.config.version() == Version::One
+ || context.config.indent_style() == IndentStyle::Visual
+ {
+ let inner_width = shape.width.checked_sub(3)?;
+ return ty
+ .rewrite(context, Shape::legacy(inner_width, shape.indent + 3))
+ .map(|r| format!("-> {}", r));
+ }
+
+ ty.rewrite(context, shape.offset_left(3)?)
+ .map(|s| format!("-> {}", s))
}
}
}
}
fn is_empty_infer(ty: &ast::Ty, pat_span: Span) -> bool {
- match ty.node {
+ match ty.kind {
ast::TyKind::Infer => ty.span.hi() == pat_span.hi(),
_ => false,
}
}
-/// Recover any missing comments between the argument and the type.
+/// Recover any missing comments between the param and the type.
///
/// # Returns
///
/// A 2-len tuple with the comment before the colon in first position, and the comment after the
/// colon in second position.
-fn get_missing_arg_comments(
+fn get_missing_param_comments(
context: &RewriteContext<'_>,
pat_span: Span,
ty_span: Span,
(comment_before_colon, comment_after_colon)
}
-impl Rewrite for ast::Arg {
+impl Rewrite for ast::Param {
fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
+ let param_attrs_result = self
+ .attrs
+ .rewrite(context, Shape::legacy(shape.width, shape.indent))?;
+ let (span, has_multiple_attr_lines) = if !self.attrs.is_empty() {
+ let num_attrs = self.attrs.len();
+ (
+ mk_sp(self.attrs[num_attrs - 1].span.hi(), self.pat.span.lo()),
+ param_attrs_result.contains("\n"),
+ )
+ } else {
+ (mk_sp(self.span.lo(), self.span.lo()), false)
+ };
+
if let Some(ref explicit_self) = self.to_self() {
- rewrite_explicit_self(context, explicit_self)
- } else if is_named_arg(self) {
- let mut result = self
- .pat
- .rewrite(context, Shape::legacy(shape.width, shape.indent))?;
+ rewrite_explicit_self(
+ context,
+ explicit_self,
+ ¶m_attrs_result,
+ span,
+ shape,
+ has_multiple_attr_lines,
+ )
+ } else if is_named_param(self) {
+ let mut result = combine_strs_with_missing_comments(
+ context,
+ ¶m_attrs_result,
+ &self
+ .pat
+ .rewrite(context, Shape::legacy(shape.width, shape.indent))?,
+ span,
+ shape,
+ !has_multiple_attr_lines,
+ )?;
if !is_empty_infer(&*self.ty, self.pat.span) {
let (before_comment, after_comment) =
- get_missing_arg_comments(context, self.pat.span, self.ty.span, shape);
+ get_missing_param_comments(context, self.pat.span, self.ty.span, shape);
result.push_str(&before_comment);
result.push_str(colon_spaces(context.config));
result.push_str(&after_comment);
fn rewrite_explicit_self(
context: &RewriteContext<'_>,
explicit_self: &ast::ExplicitSelf,
+ param_attrs: &str,
+ span: Span,
+ shape: Shape,
+ has_multiple_attr_lines: bool,
) -> Option<String> {
match explicit_self.node {
ast::SelfKind::Region(lt, m) => {
context,
Shape::legacy(context.config.max_width(), Indent::empty()),
)?;
- Some(format!("&{} {}self", lifetime_str, mut_str))
+ Some(combine_strs_with_missing_comments(
+ context,
+ ¶m_attrs,
+ &format!("&{} {}self", lifetime_str, mut_str),
+ span,
+ shape,
+ !has_multiple_attr_lines,
+ )?)
}
- None => Some(format!("&{}self", mut_str)),
+ None => Some(combine_strs_with_missing_comments(
+ context,
+ ¶m_attrs,
+ &format!("&{}self", mut_str),
+ span,
+ shape,
+ !has_multiple_attr_lines,
+ )?),
}
}
ast::SelfKind::Explicit(ref ty, mutability) => {
Shape::legacy(context.config.max_width(), Indent::empty()),
)?;
- Some(format!(
- "{}self: {}",
- format_mutability(mutability),
- type_str
- ))
+ Some(combine_strs_with_missing_comments(
+ context,
+ ¶m_attrs,
+ &format!("{}self: {}", format_mutability(mutability), type_str),
+ span,
+ shape,
+ !has_multiple_attr_lines,
+ )?)
}
- ast::SelfKind::Value(mutability) => Some(format!("{}self", format_mutability(mutability))),
+ ast::SelfKind::Value(mutability) => Some(combine_strs_with_missing_comments(
+ context,
+ ¶m_attrs,
+ &format!("{}self", format_mutability(mutability)),
+ span,
+ shape,
+ !has_multiple_attr_lines,
+ )?),
}
}
-pub(crate) fn span_lo_for_arg(arg: &ast::Arg) -> BytePos {
- if is_named_arg(arg) {
- arg.pat.span.lo()
+pub(crate) fn span_lo_for_param(param: &ast::Param) -> BytePos {
+ if param.attrs.is_empty() {
+ if is_named_param(param) {
+ param.pat.span.lo()
+ } else {
+ param.ty.span.lo()
+ }
} else {
- arg.ty.span.lo()
+ param.attrs[0].span.lo()
}
}
-pub(crate) fn span_hi_for_arg(context: &RewriteContext<'_>, arg: &ast::Arg) -> BytePos {
- match arg.ty.node {
- 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(),
+pub(crate) fn span_hi_for_param(context: &RewriteContext<'_>, param: &ast::Param) -> BytePos {
+ match param.ty.kind {
+ ast::TyKind::Infer if context.snippet(param.ty.span) == "_" => param.ty.span.hi(),
+ ast::TyKind::Infer if is_named_param(param) => param.pat.span.hi(),
+ _ => param.ty.span.hi(),
}
}
-pub(crate) fn is_named_arg(arg: &ast::Arg) -> bool {
- if let ast::PatKind::Ident(_, ident, _) = arg.pat.node {
- ident != symbol::keywords::Invalid.ident()
+pub(crate) fn is_named_param(param: &ast::Param) -> bool {
+ if let ast::PatKind::Ident(_, ident, _) = param.pat.kind {
+ ident.name != symbol::kw::Invalid
} else {
true
}
}
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+pub(crate) enum FnBraceStyle {
+ SameLine,
+ NextLine,
+ None,
+}
+
// Return type is (result, force_new_line_for_brace)
fn rewrite_fn_base(
context: &RewriteContext<'_>,
ident: ast::Ident,
fn_sig: &FnSig<'_>,
span: Span,
- newline_brace: bool,
- has_body: bool,
+ fn_brace_style: FnBraceStyle,
) -> Option<(String, bool)> {
let mut force_new_line_for_brace = false;
result.push_str("fn ");
// Generics.
- let overhead = if has_body && !newline_brace {
+ let overhead = if let FnBraceStyle::SameLine = fn_brace_style {
// 4 = `() {`
4
} else {
let multi_line_ret_str = ret_str.contains('\n');
let ret_str_len = if multi_line_ret_str { 0 } else { ret_str.len() };
- // Args.
- let (one_line_budget, multi_line_budget, mut arg_indent) = compute_budgets_for_args(
+ // Params.
+ let (one_line_budget, multi_line_budget, mut param_indent) = compute_budgets_for_params(
context,
&result,
indent,
ret_str_len,
- newline_brace,
- has_body,
+ fn_brace_style,
multi_line_ret_str,
)?;
debug!(
- "rewrite_fn_base: one_line_budget: {}, multi_line_budget: {}, arg_indent: {:?}",
- one_line_budget, multi_line_budget, arg_indent
+ "rewrite_fn_base: one_line_budget: {}, multi_line_budget: {}, param_indent: {:?}",
+ one_line_budget, multi_line_budget, param_indent
);
result.push('(');
&& !snuggle_angle_bracket
&& context.config.indent_style() == IndentStyle::Visual
{
- result.push_str(&arg_indent.to_string_with_newline(context.config));
+ result.push_str(¶m_indent.to_string_with_newline(context.config));
}
// Skip `pub(crate)`.
let lo_after_visibility = get_bytepos_after_visibility(&fn_sig.visibility, span);
// A conservative estimation, to goal is to be over all parens in generics
- let args_start = fn_sig
+ let params_start = fn_sig
.generics
.params
.iter()
.last()
.map_or(lo_after_visibility, |param| param.span().hi());
- let args_end = if fd.inputs.is_empty() {
+ let params_end = if fd.inputs.is_empty() {
context
.snippet_provider
- .span_after(mk_sp(args_start, span.hi()), ")")
+ .span_after(mk_sp(params_start, span.hi()), ")")
} else {
let last_span = mk_sp(fd.inputs[fd.inputs.len() - 1].span().hi(), span.hi());
context.snippet_provider.span_after(last_span, ")")
};
- let args_span = mk_sp(
+ let params_span = mk_sp(
context
.snippet_provider
- .span_after(mk_sp(args_start, span.hi()), "("),
- args_end,
+ .span_after(mk_sp(params_start, span.hi()), "("),
+ params_end,
);
- let arg_str = rewrite_args(
+ let param_str = rewrite_params(
context,
&fd.inputs,
one_line_budget,
multi_line_budget,
indent,
- arg_indent,
- args_span,
- fd.c_variadic,
+ param_indent,
+ params_span,
+ fd.c_variadic(),
)?;
- let put_args_in_block = match context.config.indent_style() {
- IndentStyle::Block => arg_str.contains('\n') || arg_str.len() > one_line_budget,
+ let put_params_in_block = match context.config.indent_style() {
+ IndentStyle::Block => param_str.contains('\n') || param_str.len() > one_line_budget,
_ => false,
} && !fd.inputs.is_empty();
- let mut args_last_line_contains_comment = false;
- let mut no_args_and_over_max_width = false;
+ let mut params_last_line_contains_comment = false;
+ let mut no_params_and_over_max_width = false;
- if put_args_in_block {
- arg_indent = indent.block_indent(context.config);
- result.push_str(&arg_indent.to_string_with_newline(context.config));
- result.push_str(&arg_str);
+ if put_params_in_block {
+ param_indent = indent.block_indent(context.config);
+ result.push_str(¶m_indent.to_string_with_newline(context.config));
+ result.push_str(¶m_str);
result.push_str(&indent.to_string_with_newline(context.config));
result.push(')');
} else {
- result.push_str(&arg_str);
+ result.push_str(¶m_str);
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 = `)`
let closing_paren_overflow_max_width =
fd.inputs.is_empty() && used_width + 1 > context.config.max_width();
- // If the last line of args contains comment, we cannot put the closing paren
+ // If the last line of params contains comment, we cannot put the closing paren
// on the same line.
- args_last_line_contains_comment = arg_str
+ params_last_line_contains_comment = param_str
.lines()
.last()
.map_or(false, |last_line| last_line.contains("//"));
if context.config.version() == Version::Two {
result.push(')');
- if closing_paren_overflow_max_width || args_last_line_contains_comment {
+ if closing_paren_overflow_max_width || params_last_line_contains_comment {
result.push_str(&indent.to_string_with_newline(context.config));
- no_args_and_over_max_width = true;
+ no_params_and_over_max_width = true;
}
} else {
- if closing_paren_overflow_max_width || args_last_line_contains_comment {
+ if closing_paren_overflow_max_width || params_last_line_contains_comment {
result.push_str(&indent.to_string_with_newline(context.config));
}
result.push(')');
// Return type.
if let ast::FunctionRetTy::Ty(..) = fd.output {
let ret_should_indent = match context.config.indent_style() {
- // If our args are block layout then we surely must have space.
- IndentStyle::Block if put_args_in_block || fd.inputs.is_empty() => false,
- _ if args_last_line_contains_comment => false,
+ // If our params are block layout then we surely must have space.
+ IndentStyle::Block if put_params_in_block || fd.inputs.is_empty() => false,
+ _ if params_last_line_contains_comment => false,
_ if result.contains('\n') || multi_line_ret_str => true,
_ => {
// 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.
+ // the closing parenthesis of the param and the arrow '->' is considered.
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
sig_length > context.config.max_width()
}
};
- let ret_indent = if ret_should_indent {
- let indent = if arg_str.is_empty() {
- // Aligning with non-existent args looks silly.
- force_new_line_for_brace = true;
- indent + 4
+ let ret_shape = if ret_should_indent {
+ if context.config.version() == Version::One
+ || context.config.indent_style() == IndentStyle::Visual
+ {
+ let indent = if param_str.is_empty() {
+ // Aligning with non-existent params looks silly.
+ force_new_line_for_brace = true;
+ indent + 4
+ } else {
+ // FIXME: we might want to check that using the param indent
+ // doesn't blow our budget, and if it does, then fallback to
+ // the where-clause indent.
+ param_indent
+ };
+
+ result.push_str(&indent.to_string_with_newline(context.config));
+ Shape::indented(indent, context.config)
} else {
- // 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
- };
+ let mut ret_shape = Shape::indented(indent, context.config);
+ if param_str.is_empty() {
+ // Aligning with non-existent params looks silly.
+ force_new_line_for_brace = true;
+ ret_shape = if context.use_block_indent() {
+ ret_shape.offset_left(4).unwrap_or(ret_shape)
+ } else {
+ ret_shape.indent = ret_shape.indent + 4;
+ ret_shape
+ };
+ }
- result.push_str(&indent.to_string_with_newline(context.config));
- indent
+ result.push_str(&ret_shape.indent.to_string_with_newline(context.config));
+ ret_shape
+ }
} else {
if context.config.version() == Version::Two {
- if !arg_str.is_empty() || !no_args_and_over_max_width {
+ if !param_str.is_empty() || !no_params_and_over_max_width {
result.push(' ');
}
} else {
result.push(' ');
}
- Indent::new(indent.block_indent, last_line_width(&result))
+ let ret_shape = Shape::indented(indent, context.config);
+ ret_shape
+ .offset_left(last_line_width(&result))
+ .unwrap_or(ret_shape)
};
if multi_line_ret_str || ret_should_indent {
// Now that we know the proper indent and width, we need to
// re-layout the return type.
- let ret_str = fd
- .output
- .rewrite(context, Shape::indented(ret_indent, context.config))?;
+ let ret_str = fd.output.rewrite(context, ret_shape)?;
result.push_str(&ret_str);
} else {
result.push_str(&ret_str);
}
let pos_before_where = match fd.output {
- ast::FunctionRetTy::Default(..) => args_span.hi(),
+ ast::FunctionRetTy::Default(..) => params_span.hi(),
ast::FunctionRetTy::Ty(ref ty) => ty.span.hi(),
};
- let is_args_multi_lined = arg_str.contains('\n');
+ let is_params_multi_lined = param_str.contains('\n');
- let option = WhereClauseOption::new(!has_body, put_args_in_block && ret_str.is_empty());
+ let space = if put_params_in_block && ret_str.is_empty() {
+ WhereClauseSpace::Space
+ } else {
+ WhereClauseSpace::Newline
+ };
+ let mut option = WhereClauseOption::new(fn_brace_style == FnBraceStyle::None, space);
+ if is_params_multi_lined {
+ option.veto_single_line();
+ }
let where_clause_str = rewrite_where_clause(
context,
where_clause,
context.config.brace_style(),
Shape::indented(indent, context.config),
- Density::Tall,
+ true,
"{",
Some(span.hi()),
pos_before_where,
option,
- is_args_multi_lined,
)?;
// If there are neither where-clause nor return type, we may be missing comments between
- // args and `{`.
+ // params and `{`.
if where_clause_str.is_empty() {
if let ast::FunctionRetTy::Default(ret_span) = fd.output {
match recover_missing_comment_in_span(
- mk_sp(args_span.hi(), ret_span.hi()),
+ mk_sp(params_span.hi(), ret_span.hi()),
shape,
context,
last_line_width(&result),
result.push_str(&where_clause_str);
force_new_line_for_brace |= last_line_contains_single_line_comment(&result);
- force_new_line_for_brace |= is_args_multi_lined && context.config.where_single_line();
+ force_new_line_for_brace |= is_params_multi_lined && context.config.where_single_line();
Some((result, force_new_line_for_brace))
}
+/// Kind of spaces to put before `where`.
+#[derive(Copy, Clone)]
+enum WhereClauseSpace {
+ /// A single space.
+ Space,
+ /// A new line.
+ Newline,
+ /// Nothing.
+ None,
+}
+
#[derive(Copy, Clone)]
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
+ snuggle: WhereClauseSpace,
+ allow_single_line: bool, // Try single line where-clause instead of vertical layout
+ veto_single_line: bool, // Disallow a single-line where-clause.
}
impl WhereClauseOption {
- fn new(suppress_comma: bool, snuggle: bool) -> WhereClauseOption {
+ fn new(suppress_comma: bool, snuggle: WhereClauseSpace) -> WhereClauseOption {
WhereClauseOption {
suppress_comma,
snuggle,
- compress_where: false,
+ allow_single_line: false,
+ veto_single_line: false,
}
}
fn snuggled(current: &str) -> WhereClauseOption {
WhereClauseOption {
suppress_comma: false,
- snuggle: last_line_width(current) == 1,
- compress_where: false,
+ snuggle: if last_line_width(current) == 1 {
+ WhereClauseSpace::Space
+ } else {
+ WhereClauseSpace::Newline
+ },
+ allow_single_line: false,
+ veto_single_line: false,
}
}
self.suppress_comma = true
}
- fn compress_where(&mut self) {
- self.compress_where = true
+ fn allow_single_line(&mut self) {
+ self.allow_single_line = true
}
fn snuggle(&mut self) {
- self.snuggle = true
+ self.snuggle = WhereClauseSpace::Space
+ }
+
+ fn veto_single_line(&mut self) {
+ self.veto_single_line = true;
}
}
-fn rewrite_args(
+fn rewrite_params(
context: &RewriteContext<'_>,
- args: &[ast::Arg],
+ params: &[ast::Param],
one_line_budget: usize,
multi_line_budget: usize,
indent: Indent,
- arg_indent: Indent,
+ param_indent: Indent,
span: Span,
variadic: bool,
) -> Option<String> {
- if args.is_empty() {
+ if params.is_empty() {
let comment = context
.snippet(mk_sp(
span.lo(),
.trim();
return Some(comment.to_owned());
}
- let arg_items: Vec<_> = itemize_list(
+ let param_items: Vec<_> = itemize_list(
context.snippet_provider,
- args.iter(),
+ params.iter(),
")",
",",
- |arg| span_lo_for_arg(arg),
- |arg| arg.ty.span.hi(),
- |arg| {
- arg.rewrite(context, Shape::legacy(multi_line_budget, arg_indent))
- .or_else(|| Some(context.snippet(arg.span()).to_owned()))
+ |param| span_lo_for_param(param),
+ |param| param.ty.span.hi(),
+ |param| {
+ param
+ .rewrite(context, Shape::legacy(multi_line_budget, param_indent))
+ .or_else(|| Some(context.snippet(param.span()).to_owned()))
},
span.lo(),
span.hi(),
.collect();
let tactic = definitive_tactic(
- &arg_items,
+ ¶m_items,
context
.config
- .fn_args_density()
- .to_list_tactic(arg_items.len()),
+ .fn_args_layout()
+ .to_list_tactic(param_items.len()),
Separator::Comma,
one_line_budget,
);
};
let indent = match context.config.indent_style() {
IndentStyle::Block => indent.block_indent(context.config),
- IndentStyle::Visual => arg_indent,
+ IndentStyle::Visual => param_indent,
};
let trailing_separator = if variadic {
SeparatorTactic::Never
.trailing_separator(trailing_separator)
.ends_with_newline(tactic.ends_with_newline(context.config.indent_style()))
.preserve_newline(true);
- write_list(&arg_items, &fmt)
+ write_list(¶m_items, &fmt)
}
-fn compute_budgets_for_args(
+fn compute_budgets_for_params(
context: &RewriteContext<'_>,
result: &str,
indent: Indent,
ret_str_len: usize,
- newline_brace: bool,
- has_braces: bool,
+ fn_brace_style: FnBraceStyle,
force_vertical_layout: bool,
) -> Option<((usize, usize, Indent))> {
debug!(
- "compute_budgets_for_args {} {:?}, {}, {}",
+ "compute_budgets_for_params {} {:?}, {}, {:?}",
result.len(),
indent,
ret_str_len,
- newline_brace
+ fn_brace_style,
);
// Try keeping everything on the same line.
if !result.contains('\n') && !force_vertical_layout {
// 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;
+ match fn_brace_style {
+ FnBraceStyle::None => used_space += 1, // 1 = `;`
+ FnBraceStyle::SameLine => used_space += 2, // 2 = `{}`
+ FnBraceStyle::NextLine => (),
}
let one_line_budget = context.budget(used_space);
}
IndentStyle::Visual => {
let indent = indent + result.len() + 1;
- let multi_line_overhead = indent.width() + if newline_brace { 2 } else { 4 };
+ let multi_line_overhead = match fn_brace_style {
+ FnBraceStyle::SameLine => 4,
+ _ => 2,
+ } + indent.width();
(indent, context.budget(multi_line_overhead))
}
};
}
}
- // Didn't work. we must force vertical layout and put args on a newline.
+ // Didn't work. we must force vertical layout and put params on a newline.
let new_indent = indent.block_indent(context.config);
let used_space = match context.config.indent_style() {
// 1 = `,`
Some((0, context.budget(used_space), new_indent))
}
-fn newline_for_brace(config: &Config, where_clause: &ast::WhereClause) -> bool {
+fn newline_for_brace(config: &Config, where_clause: &ast::WhereClause) -> FnBraceStyle {
let predicate_count = where_clause.predicates.len();
if config.where_single_line() && predicate_count == 1 {
- return false;
+ return FnBraceStyle::SameLine;
}
let brace_style = config.brace_style();
- brace_style == BraceStyle::AlwaysNextLine
- || (brace_style == BraceStyle::SameLineWhere && predicate_count > 0)
+ let use_next_line = brace_style == BraceStyle::AlwaysNextLine
+ || (brace_style == BraceStyle::SameLineWhere && predicate_count > 0);
+ if use_next_line {
+ FnBraceStyle::NextLine
+ } else {
+ FnBraceStyle::SameLine
+ }
}
fn rewrite_generics(
span_end: Option<BytePos>,
span_end_before_where: BytePos,
where_clause_option: WhereClauseOption,
- is_args_multi_line: bool,
) -> Option<String> {
+ let (where_keyword, allow_single_line) = rewrite_where_keyword(
+ context,
+ where_clause,
+ shape,
+ span_end_before_where,
+ where_clause_option,
+ )?;
+
+ // 1 = `,`
+ let clause_shape = shape
+ .block()
+ .with_max_width(context.config)
+ .block_left(context.config.tab_spaces())?
+ .sub_width(1)?;
+ let force_single_line = context.config.where_single_line()
+ && where_clause.predicates.len() == 1
+ && !where_clause_option.veto_single_line;
+
+ let preds_str = rewrite_bounds_on_where_clause(
+ context,
+ where_clause,
+ clause_shape,
+ terminator,
+ span_end,
+ where_clause_option,
+ force_single_line,
+ )?;
+
+ // 6 = `where `
+ let clause_sep =
+ if allow_single_line && !preds_str.contains('\n') && 6 + preds_str.len() <= shape.width
+ || force_single_line
+ {
+ Cow::from(" ")
+ } else {
+ clause_shape.indent.to_string_with_newline(context.config)
+ };
+
+ Some(format!("{}{}{}", where_keyword, clause_sep, preds_str))
+}
+
+/// Rewrite `where` and comment around it.
+fn rewrite_where_keyword(
+ context: &RewriteContext<'_>,
+ where_clause: &ast::WhereClause,
+ shape: Shape,
+ span_end_before_where: BytePos,
+ where_clause_option: WhereClauseOption,
+) -> Option<(String, bool)> {
let block_shape = shape.block().with_max_width(context.config);
+ // 1 = `,`
+ let clause_shape = block_shape
+ .block_left(context.config.tab_spaces())?
+ .sub_width(1)?;
+
+ let comment_separator = |comment: &str, shape: Shape| {
+ if comment.is_empty() {
+ Cow::from("")
+ } else {
+ shape.indent.to_string_with_newline(context.config)
+ }
+ };
let (span_before, span_after) =
missing_span_before_after_where(span_end_before_where, where_clause);
let (comment_before, comment_after) =
rewrite_comments_before_after_where(context, span_before, span_after, shape)?;
- let starting_newline = if where_clause_option.snuggle && comment_before.is_empty() {
- Cow::from(" ")
- } else {
- block_shape.indent.to_string_with_newline(context.config)
+ let starting_newline = match where_clause_option.snuggle {
+ WhereClauseSpace::Space if comment_before.is_empty() => Cow::from(" "),
+ WhereClauseSpace::None => Cow::from(""),
+ _ => block_shape.indent.to_string_with_newline(context.config),
};
- let clause_shape = block_shape.block_left(context.config.tab_spaces())?;
- // 1 = `,`
- let clause_shape = clause_shape.sub_width(1)?;
- // each clause on one line, trailing comma (except if suppress_comma)
+ let newline_before_where = comment_separator(&comment_before, shape);
+ let newline_after_where = comment_separator(&comment_after, clause_shape);
+ let result = format!(
+ "{}{}{}where{}{}",
+ starting_newline, comment_before, newline_before_where, newline_after_where, comment_after
+ );
+ let allow_single_line = where_clause_option.allow_single_line
+ && comment_before.is_empty()
+ && comment_after.is_empty();
+
+ Some((result, allow_single_line))
+}
+
+/// Rewrite bounds on a where clause.
+fn rewrite_bounds_on_where_clause(
+ context: &RewriteContext<'_>,
+ where_clause: &ast::WhereClause,
+ shape: Shape,
+ terminator: &str,
+ span_end: Option<BytePos>,
+ where_clause_option: WhereClauseOption,
+ force_single_line: bool,
+) -> Option<String> {
let span_start = where_clause.predicates[0].span().lo();
// If we don't have the start of the next span, then use the end of the
// predicates, but that means we miss comments.
",",
|pred| pred.span().lo(),
|pred| pred.span().hi(),
- |pred| pred.rewrite(context, clause_shape),
+ |pred| pred.rewrite(context, shape),
span_start,
span_end,
false,
);
- let where_single_line = context.config.where_single_line() && len == 1 && !is_args_multi_line;
- let comma_tactic = if where_clause_option.suppress_comma || where_single_line {
+ let comma_tactic = if where_clause_option.suppress_comma || force_single_line {
SeparatorTactic::Never
} else {
context.config.trailing_comma()
};
- // shape should be vertical only and only if we have `where_single_line` option enabled
+ // shape should be vertical only and only if we have `force_single_line` option enabled
// and the number of items of the where-clause is equal to 1
- let shape_tactic = if where_single_line {
+ let shape_tactic = if force_single_line {
DefinitiveListTactic::Horizontal
} else {
DefinitiveListTactic::Vertical
};
- let fmt = ListFormatting::new(clause_shape, context.config)
+ let fmt = ListFormatting::new(shape, context.config)
.tactic(shape_tactic)
.trailing_separator(comma_tactic)
.preserve_newline(true);
- let preds_str = write_list(&items.collect::<Vec<_>>(), &fmt)?;
-
- let comment_separator = |comment: &str, shape: Shape| {
- if comment.is_empty() {
- Cow::from("")
- } else {
- shape.indent.to_string_with_newline(context.config)
- }
- };
- let newline_before_where = comment_separator(&comment_before, shape);
- let newline_after_where = comment_separator(&comment_after, clause_shape);
-
- // 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
- || where_single_line
- {
- Cow::from(" ")
- } else {
- clause_shape.indent.to_string_with_newline(context.config)
- };
- Some(format!(
- "{}{}{}where{}{}{}{}",
- starting_newline,
- comment_before,
- newline_before_where,
- newline_after_where,
- comment_after,
- clause_sep,
- preds_str
- ))
+ write_list(&items.collect::<Vec<_>>(), &fmt)
}
fn rewrite_where_clause(
where_clause: &ast::WhereClause,
brace_style: BraceStyle,
shape: Shape,
- density: Density,
+ on_new_line: bool,
terminator: &str,
span_end: Option<BytePos>,
span_end_before_where: BytePos,
where_clause_option: WhereClauseOption,
- is_args_multi_line: bool,
) -> Option<String> {
if where_clause.predicates.is_empty() {
return Some(String::new());
span_end,
span_end_before_where,
where_clause_option,
- is_args_multi_line,
);
}
} else {
terminator.len()
};
- if density == Density::Tall
+ if on_new_line
|| preds_str.contains('\n')
|| shape.indent.width() + " where ".len() + preds_str.len() + end_length > shape.width
{
&generics.where_clause,
brace_style,
Shape::legacy(budget, offset.block_only()),
- Density::Tall,
+ true,
"{",
Some(span.hi()),
span_end_before_where,
option,
- false,
)?;
result.push_str(&where_clause_str);
(
// FIXME: this may be a faulty span from libsyntax.
let span = mk_sp(self.span.lo(), self.span.hi() - BytePos(1));
- let item_str = match self.node {
+ let item_str = match self.kind {
ast::ForeignItemKind::Fn(ref fn_decl, ref generics) => rewrite_fn_base(
context,
shape.indent,
self.ident,
&FnSig::new(fn_decl, generics, self.vis.clone()),
span,
- false,
- false,
+ FnBraceStyle::None,
)
.map(|(s, _)| format!("{};", s)),
- ast::ForeignItemKind::Static(ref ty, is_mutable) => {
+ ast::ForeignItemKind::Static(ref ty, mutability) => {
// FIXME(#21): we're dropping potential comments in between the
- // function keywords here.
+ // function kw here.
let vis = format_visibility(context, &self.vis);
- let mut_str = if is_mutable { "mut " } else { "" };
+ let mut_str = format_mutability(mutability);
let prefix = format!(
"{}static {}{}:",
vis,
}
}
+/// Rewrite the attributes of an item.
+fn rewrite_attrs(
+ context: &RewriteContext<'_>,
+ item: &ast::Item,
+ item_str: &str,
+ shape: Shape,
+) -> Option<String> {
+ let attrs = filter_inline_attrs(&item.attrs, item.span());
+ let attrs_str = attrs.rewrite(context, shape)?;
+
+ let missed_span = if attrs.is_empty() {
+ mk_sp(item.span.lo(), item.span.lo())
+ } else {
+ mk_sp(attrs[attrs.len() - 1].span.hi(), item.span.lo())
+ };
+
+ let allow_extend = if attrs.len() == 1 {
+ let line_len = attrs_str.len() + 1 + item_str.len();
+ !attrs.first().unwrap().is_sugared_doc
+ && context.config.inline_attribute_width() >= line_len
+ } else {
+ false
+ };
+
+ combine_strs_with_missing_comments(
+ context,
+ &attrs_str,
+ &item_str,
+ missed_span,
+ shape,
+ allow_extend,
+ )
+}
+
/// Rewrite an inline mod.
-pub(crate) fn rewrite_mod(context: &RewriteContext<'_>, item: &ast::Item) -> String {
+/// The given shape is used to format the mod's attributes.
+pub(crate) fn rewrite_mod(
+ context: &RewriteContext<'_>,
+ item: &ast::Item,
+ attrs_shape: Shape,
+) -> Option<String> {
let mut result = String::with_capacity(32);
result.push_str(&*format_visibility(context, &item.vis));
result.push_str("mod ");
result.push_str(rewrite_ident(context, item.ident));
result.push(';');
- result
+ rewrite_attrs(context, item, &result, attrs_shape)
}
-/// Rewrite `extern crate foo;` WITHOUT attributes.
+/// Rewrite `extern crate foo;`.
+/// The given shape is used to format the extern crate's attributes.
pub(crate) fn rewrite_extern_crate(
context: &RewriteContext<'_>,
item: &ast::Item,
+ attrs_shape: Shape,
) -> Option<String> {
assert!(is_extern_crate(item));
let new_str = context.snippet(item.span);
- Some(if contains_comment(new_str) {
+ let item_str = if contains_comment(new_str) {
new_str.to_owned()
} else {
let no_whitespace = &new_str.split_whitespace().collect::<Vec<&str>>().join(" ");
String::from(&*Regex::new(r"\s;").unwrap().replace(no_whitespace, ";"))
- })
+ };
+ rewrite_attrs(context, item, &item_str, attrs_shape)
}
/// Returns `true` for `mod foo;`, false for `mod foo { .. }`.
pub(crate) fn is_mod_decl(item: &ast::Item) -> bool {
- match item.node {
+ match item.kind {
ast::ItemKind::Mod(ref m) => m.inner.hi() != item.span.hi(),
_ => false,
}
}
pub(crate) fn is_use_item(item: &ast::Item) -> bool {
- match item.node {
+ match item.kind {
ast::ItemKind::Use(_) => true,
_ => false,
}
}
pub(crate) fn is_extern_crate(item: &ast::Item) -> bool {
- match item.node {
+ match item.kind {
ast::ItemKind::ExternCrate(..) => true,
_ => false,
}
projects / rust.git / blobdiff