use std::cmp::{max, min, Ordering};
use regex::Regex;
-use rustc_span::{source_map, symbol, BytePos, Span, DUMMY_SP};
-use syntax::visit;
-use syntax::{ast, ptr};
+use rustc_ast::visit;
+use rustc_ast::{ast, ptr};
+use rustc_span::{symbol, BytePos, Span, DUMMY_SP};
use crate::attr::filter_inline_attrs;
use crate::comment::{
use crate::vertical::rewrite_with_alignment;
use crate::visitor::FmtVisitor;
-const DEFAULT_VISIBILITY: ast::Visibility = source_map::Spanned {
- node: ast::VisibilityKind::Inherited,
+const DEFAULT_VISIBILITY: ast::Visibility = ast::Visibility {
+ kind: ast::VisibilityKind::Inherited,
span: DUMMY_SP,
+ tokens: None,
};
fn type_annotation_separator(config: &Config) -> &str {
// FIXME format modules in this style
#[allow(dead_code)]
struct Item<'a> {
- keyword: &'static str,
+ unsafety: ast::Unsafe,
abi: Cow<'static, str>,
vis: Option<&'a ast::Visibility>,
body: Vec<BodyElement<'a>>,
impl<'a> Item<'a> {
fn from_foreign_mod(fm: &'a ast::ForeignMod, span: Span, config: &Config) -> Item<'a> {
Item {
- keyword: "",
+ unsafety: fm.unsafety,
abi: format_extern(
ast::Extern::from_abi(fm.abi),
config.force_explicit_abi(),
decl: &'a ast::FnDecl,
generics: &'a ast::Generics,
ext: ast::Extern,
- is_async: Cow<'a, ast::IsAsync>,
- constness: ast::Constness,
+ is_async: Cow<'a, ast::Async>,
+ constness: ast::Const,
defaultness: ast::Defaultness,
- unsafety: ast::Unsafety,
+ unsafety: ast::Unsafe,
visibility: ast::Visibility,
}
decl,
generics,
ext: ast::Extern::None,
- is_async: Cow::Owned(ast::IsAsync::NotAsync),
- constness: ast::Constness::NotConst,
+ is_async: Cow::Owned(ast::Async::No),
+ constness: ast::Const::No,
defaultness: ast::Defaultness::Final,
- unsafety: ast::Unsafety::Normal,
+ unsafety: ast::Unsafe::No,
visibility: vis,
}
}
) -> FnSig<'a> {
FnSig {
unsafety: method_sig.header.unsafety,
- is_async: Cow::Borrowed(&method_sig.header.asyncness.node),
- constness: method_sig.header.constness.node,
+ is_async: Cow::Borrowed(&method_sig.header.asyncness),
+ constness: method_sig.header.constness,
defaultness: ast::Defaultness::Final,
ext: method_sig.header.ext,
decl: &*method_sig.decl,
decl,
generics,
ext: fn_sig.header.ext,
- constness: fn_sig.header.constness.node,
- is_async: Cow::Borrowed(&fn_sig.header.asyncness.node),
+ constness: fn_sig.header.constness,
+ is_async: Cow::Borrowed(&fn_sig.header.asyncness),
defaultness,
unsafety: fn_sig.header.unsafety,
visibility: vis.clone(),
impl<'a> FmtVisitor<'a> {
fn format_item(&mut self, item: &Item<'_>) {
+ self.buffer.push_str(format_unsafety(item.unsafety));
self.buffer.push_str(&item.abi);
let snippet = self.snippet(item.span);
self.last_pos = item.span.lo() + BytePos(brace_pos as u32 + 1);
self.block_indent = self.block_indent.block_indent(self.config);
- if item.body.is_empty() {
- self.format_missing_no_indent(item.span.hi() - BytePos(1));
- self.block_indent = self.block_indent.block_unindent(self.config);
- let indent_str = self.block_indent.to_string(self.config);
- self.push_str(&indent_str);
- } else {
+ if !item.body.is_empty() {
for item in &item.body {
self.format_body_element(item);
}
-
- self.block_indent = self.block_indent.block_unindent(self.config);
- self.format_missing_with_indent(item.span.hi() - BytePos(1));
}
+
+ self.format_missing_no_indent(item.span.hi() - BytePos(1));
+ self.block_indent = self.block_indent.block_unindent(self.config);
+ let indent_str = self.block_indent.to_string(self.config);
+ self.push_str(&indent_str);
}
self.push_str("}");
fn format_foreign_item(&mut self, item: &ast::ForeignItem) {
let rewrite = item.rewrite(&self.get_context(), self.shape());
- self.push_rewrite(item.span(), rewrite);
- self.last_pos = item.span.hi();
+ let hi = item.span.hi();
+ let span = if item.attrs.is_empty() {
+ item.span
+ } else {
+ mk_sp(item.attrs[0].span.lo(), hi)
+ };
+ self.push_rewrite(span, rewrite);
+ self.last_pos = hi;
}
pub(crate) fn rewrite_fn_before_block(
&mut self,
indent: Indent,
- ident: ast::Ident,
+ ident: symbol::Ident,
fn_sig: &FnSig<'_>,
span: Span,
) -> Option<(String, FnBraceStyle)> {
pub(crate) fn rewrite_required_fn(
&mut self,
indent: Indent,
- ident: ast::Ident,
+ ident: symbol::Ident,
sig: &ast::FnSig,
generics: &ast::Generics,
span: Span,
return None;
}
- let source_map = self.get_context().source_map;
+ let context = self.get_context();
if self.config.empty_item_single_line()
- && is_empty_block(block, None, source_map)
+ && is_empty_block(&context, block, None)
&& self.block_indent.width() + fn_str.len() + 3 <= self.config.max_width()
&& !last_line_contains_single_line_comment(fn_str)
{
return Some(format!("{} {{}}", fn_str));
}
- if !self.config.fn_single_line() || !is_simple_block_stmt(block, None, source_map) {
+ if !self.config.fn_single_line() || !is_simple_block_stmt(&context, block, None) {
return None;
}
pub(crate) fn visit_enum(
&mut self,
- ident: ast::Ident,
+ ident: symbol::Ident,
vis: &ast::Visibility,
enum_def: &ast::EnumDef,
generics: &ast::Generics,
self.buffer.clear();
}
- fn is_type(ty: &Option<syntax::ptr::P<ast::Ty>>) -> bool {
- match ty {
- None => true,
- Some(lty) => match lty.kind.opaque_top_hack() {
- None => true,
- Some(_) => false,
- },
+ fn is_type(ty: &Option<rustc_ast::ptr::P<ast::Ty>>) -> bool {
+ if let Some(lty) = ty {
+ if let ast::TyKind::ImplTrait(..) = lty.kind {
+ return false;
+ }
}
+ true
}
- fn is_opaque(ty: &Option<syntax::ptr::P<ast::Ty>>) -> bool {
- match ty {
- None => false,
- Some(lty) => match lty.kind.opaque_top_hack() {
- None => false,
- Some(_) => true,
- },
- }
+ fn is_opaque(ty: &Option<rustc_ast::ptr::P<ast::Ty>>) -> bool {
+ !is_type(ty)
}
fn both_type(
- a: &Option<
syntax::ptr::P<ast::Ty>>,
- b: &Option<
syntax::ptr::P<ast::Ty>>,
+ a: &Option<
rustc_ast::ptr::P<ast::Ty>>,
+ b: &Option<
rustc_ast::ptr::P<ast::Ty>>,
) -> bool {
is_type(a) && is_type(b)
}
fn both_opaque(
- a: &Option<
syntax::ptr::P<ast::Ty>>,
- b: &Option<
syntax::ptr::P<ast::Ty>>,
+ a: &Option<
rustc_ast::ptr::P<ast::Ty>>,
+ b: &Option<
rustc_ast::ptr::P<ast::Ty>>,
) -> bool {
is_opaque(a) && is_opaque(b)
}
use crate::ast::AssocItemKind::*;
fn need_empty_line(a: &ast::AssocItemKind, b: &ast::AssocItemKind) -> bool {
match (a, b) {
- (TyAlias(_, ref lty), TyAlias(_, ref rty))
+ (TyAlias(_, _, _, ref lty), TyAlias(_, _, _, ref rty))
if both_type(lty, rty) || both_opaque(lty, rty) =>
{
false
}
buffer.sort_by(|(_, a), (_, b)| match (&a.kind, &b.kind) {
- (TyAlias(_, ref lty), TyAlias(_, ref rty))
+ (TyAlias(_, _, _, ref lty), TyAlias(_, _, _, ref rty))
if both_type(lty, rty) || both_opaque(lty, rty) =>
{
a.ident.as_str().cmp(&b.ident.as_str())
}
- (Const(..), Const(..)) | (Macro(..), Macro(..)) => {
+ (Const(..), Const(..)) | (MacCall(..), MacCall(..)) => {
a.ident.as_str().cmp(&b.ident.as_str())
}
(Fn(..), Fn(..)) => a.span.lo().cmp(&b.span.lo()),
- (TyAlias(_, ref ty), _) if is_type(ty) => Ordering::Less,
- (_, TyAlias(_, ref ty)) if is_type(ty) => Ordering::Greater,
+ (TyAlias(_, _, _, ref ty), _) if is_type(ty) => Ordering::Less,
+ (_, TyAlias(_, _, _, ref ty)) if is_type(ty) => Ordering::Greater,
(TyAlias(..), _) => Ordering::Less,
(_, TyAlias(..)) => Ordering::Greater,
(Const(..), _) => Ordering::Less,
(_, Const(..)) => Ordering::Greater,
- (Macro(..), _) => Ordering::Less,
- (_, Macro(..)) => Ordering::Greater,
+ (MacCall(..), _) => Ordering::Less,
+ (_, MacCall(..)) => Ordering::Greater,
});
let mut prev_kind = None;
for (buf, item) in buffer {
let generics_str = rewrite_generics(context, "impl", generics, shape)?;
result.push_str(&generics_str);
- let polarity_str = if polarity == ast::ImplPolarity::Negative {
- "!"
- } else {
- ""
+ let polarity_str = match polarity {
+ ast::ImplPolarity::Negative(_) => "!",
+ ast::ImplPolarity::Positive => "",
};
if let Some(ref trait_ref) = *trait_ref {
pub(crate) struct StructParts<'a> {
prefix: &'a str,
- ident: ast::Ident,
+ ident: symbol::Ident,
vis: &'a ast::Visibility,
def: &'a ast::VariantData,
generics: Option<&'a ast::Generics>,
pub(crate) fn format_trait_alias(
context: &RewriteContext<'_>,
- ident: ast::Ident,
+ ident: symbol::Ident,
vis: &ast::Visibility,
generics: &ast::Generics,
generic_bounds: &ast::GenericBounds,
}
fn get_bytepos_after_visibility(vis: &ast::Visibility, default_span: Span) -> BytePos {
- match vis.node {
+ match vis.kind {
ast::VisibilityKind::Crate(..) | ast::VisibilityKind::Restricted { .. } => vis.span.hi(),
_ => default_span.lo(),
}
Some(result)
}
-fn rewrite_type_prefix(
+fn rewrite_type<R: Rewrite>(
context: &RewriteContext<'_>,
indent: Indent,
- prefix: &str,
- ident: ast::Ident,
+ ident: symbol::Ident,
+ vis: &ast::Visibility,
generics: &ast::Generics,
+ generic_bounds_opt: Option<&ast::GenericBounds>,
+ rhs: Option<&R>,
) -> Option<String> {
let mut result = String::with_capacity(128);
- result.push_str(prefix);
+ result.push_str(&format!("{}type ", format_visibility(context, vis)));
let ident_str = rewrite_ident(context, ident);
- // 2 = `= `
if generics.params.is_empty() {
result.push_str(ident_str)
} else {
+ // 2 = `= `
let g_shape = Shape::indented(indent, context.config)
.offset_left(result.len())?
.sub_width(2)?;
result.push_str(&generics_str);
}
+ if let Some(bounds) = generic_bounds_opt {
+ if !bounds.is_empty() {
+ // 2 = `: `
+ let shape = Shape::indented(indent, context.config).offset_left(result.len() + 2)?;
+ let type_bounds = bounds.rewrite(context, shape).map(|s| format!(": {}", s))?;
+ result.push_str(&type_bounds);
+ }
+ }
+
let where_budget = context.budget(last_line_width(&result));
- let option = WhereClauseOption::snuggled(&result);
+ let mut option = WhereClauseOption::snuggled(&result);
+ if rhs.is_none() {
+ option.suppress_comma();
+ }
let where_clause_str = rewrite_where_clause(
context,
&generics.where_clause,
)?;
result.push_str(&where_clause_str);
- Some(result)
-}
-
-fn rewrite_type_item<R: Rewrite>(
- context: &RewriteContext<'_>,
- indent: Indent,
- prefix: &str,
- suffix: &str,
- ident: ast::Ident,
- rhs: &R,
- generics: &ast::Generics,
- vis: &ast::Visibility,
-) -> Option<String> {
- let mut result = String::with_capacity(128);
- result.push_str(&rewrite_type_prefix(
- context,
- indent,
- &format!("{}{} ", format_visibility(context, vis), prefix),
- ident,
- generics,
- )?);
+ if let Some(ty) = rhs {
+ // If there's a where clause, add a newline before the assignment. Otherwise just add a
+ // space.
+ if !generics.where_clause.predicates.is_empty() {
+ result.push_str(&indent.to_string_with_newline(context.config));
+ } else {
+ result.push(' ');
+ }
+ let lhs = format!("{}=", result);
- if generics.where_clause.predicates.is_empty() {
- result.push_str(suffix);
+ // 1 = `;`
+ let shape = Shape::indented(indent, context.config).sub_width(1)?;
+ rewrite_assign_rhs(context, lhs, &*ty, shape).map(|s| s + ";")
} else {
- result.push_str(&indent.to_string_with_newline(context.config));
- result.push_str(suffix.trim_start());
+ Some(format!("{};", result))
}
-
- // 1 = ";"
- let rhs_shape = Shape::indented(indent, context.config).sub_width(1)?;
- rewrite_assign_rhs(context, result, rhs, rhs_shape).map(|s| s + ";")
-}
-
-pub(crate) fn rewrite_type_alias(
- context: &RewriteContext<'_>,
- indent: Indent,
- ident: ast::Ident,
- ty: &ast::Ty,
- generics: &ast::Generics,
- vis: &ast::Visibility,
-) -> Option<String> {
- rewrite_type_item(context, indent, "type", " =", ident, ty, generics, vis)
}
pub(crate) fn rewrite_opaque_type(
context: &RewriteContext<'_>,
indent: Indent,
- ident: ast::Ident,
+ ident: symbol::Ident,
generic_bounds: &ast::GenericBounds,
generics: &ast::Generics,
vis: &ast::Visibility,
) -> Option<String> {
let opaque_type_bounds = OpaqueTypeBounds { generic_bounds };
- rewrite_type_item(
+ rewrite_type(
context,
indent,
- "type",
- " =",
ident,
- &opaque_type_bounds,
- generics,
vis,
+ generics,
+ Some(generic_bounds),
+ Some(&opaque_type_bounds),
)
}
pub(crate) struct StaticParts<'a> {
prefix: &'a str,
vis: &'a ast::Visibility,
- ident: ast::Ident,
+ ident: symbol::Ident,
ty: &'a ast::Ty,
mutability: ast::Mutability,
expr_opt: Option<&'a ptr::P<ast::Expr>>,
impl<'a> StaticParts<'a> {
pub(crate) fn from_item(item: &'a ast::Item) -> Self {
- 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::Not, expr),
+ let (defaultness, prefix, ty, mutability, expr) = match item.kind {
+ ast::ItemKind::Static(ref ty, mutability, ref expr) => {
+ (None, "static", ty, mutability, expr)
+ }
+ ast::ItemKind::Const(defaultness, ref ty, ref expr) => {
+ (Some(defaultness), "const", ty, ast::Mutability::Not, expr)
+ }
_ => unreachable!(),
};
StaticParts {
ident: item.ident,
ty,
mutability,
- expr_opt: Some(expr),
- defaultness: None,
+ expr_opt: expr.as_ref(),
+ defaultness,
span: item.span,
}
}
pub(crate) fn from_trait_item(ti: &'a ast::AssocItem) -> Self {
- let (ty, expr_opt) = match ti.kind {
- ast::AssocItemKind::Const(ref ty, ref expr_opt) => (ty, expr_opt),
+ let (defaultness, ty, expr_opt) = match ti.kind {
+ ast::AssocItemKind::Const(defaultness, ref ty, ref expr_opt) => {
+ (defaultness, ty, expr_opt)
+ }
_ => unreachable!(),
};
StaticParts {
ty,
mutability: ast::Mutability::Not,
expr_opt: expr_opt.as_ref(),
- defaultness: None,
+ defaultness: Some(defaultness),
span: ti.span,
}
}
pub(crate) fn from_impl_item(ii: &'a ast::AssocItem) -> Self {
- let (ty, expr) = match ii.kind {
- ast::AssocItemKind::Const(ref ty, ref expr) => (ty, expr),
+ let (defaultness, ty, expr) = match ii.kind {
+ ast::AssocItemKind::Const(defaultness, ref ty, ref expr) => (defaultness, ty, expr),
_ => unreachable!(),
};
StaticParts {
ty,
mutability: ast::Mutability::Not,
expr_opt: expr.as_ref(),
- defaultness: Some(ii.defaultness),
+ defaultness: Some(defaultness),
span: ii.span,
}
}
}
}
-pub(crate) fn rewrite_associated_type(
- ident: ast::Ident,
+pub(crate) fn rewrite_type_alias(
+ ident: symbol::Ident,
ty_opt: Option<&ptr::P<ast::Ty>>,
generics: &ast::Generics,
generic_bounds_opt: Option<&ast::GenericBounds>,
context: &RewriteContext<'_>,
indent: Indent,
+ vis: &ast::Visibility,
) -> Option<String> {
- 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 type_bounds_str = if let Some(bounds) = generic_bounds_opt {
- if bounds.is_empty() {
- String::new()
- } else {
- // 2 = ": ".len()
- let shape = Shape::indented(indent, context.config).offset_left(prefix.len() + 2)?;
- bounds.rewrite(context, shape).map(|s| format!(": {}", s))?
- }
- } else {
- String::new()
- };
-
- if let Some(ty) = ty_opt {
- // 1 = `;`
- let shape = Shape::indented(indent, context.config).sub_width(1)?;
- let lhs = format!("{}{} =", prefix, type_bounds_str);
- rewrite_assign_rhs(context, lhs, &**ty, shape).map(|s| s + ";")
- } else {
- Some(format!("{}{};", prefix, type_bounds_str))
- }
+ rewrite_type(
+ context,
+ indent,
+ ident,
+ vis,
+ generics,
+ generic_bounds_opt,
+ ty_opt,
+ )
}
struct OpaqueType<'a> {
pub(crate) fn rewrite_opaque_impl_type(
context: &RewriteContext<'_>,
- ident: ast::Ident,
+ ident: symbol::Ident,
generics: &ast::Generics,
generic_bounds: &ast::GenericBounds,
indent: Indent,
}
pub(crate) fn rewrite_associated_impl_type(
- ident: ast::Ident,
+ ident: symbol::Ident,
+ vis: &ast::Visibility,
defaultness: ast::Defaultness,
ty_opt: Option<&ptr::P<ast::Ty>>,
generics: &ast::Generics,
context: &RewriteContext<'_>,
indent: Indent,
) -> Option<String> {
- let result = rewrite_associated_type(ident, ty_opt, generics, None, context, indent)?;
+ let result = rewrite_type_alias(ident, ty_opt, generics, None, context, indent, vis)?;
match defaultness {
- ast::Defaultness::Default => Some(format!("default {}", result)),
+ ast::Defaultness::Default(..) => Some(format!("default {}", result)),
_ => Some(result),
}
}
-impl Rewrite for ast::FunctionRetTy {
+impl Rewrite for ast::FnRetTy {
fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> {
match *self {
- ast::FunctionRetTy::Default(_) => Some(String::new()),
- ast::FunctionRetTy::Ty(ref ty) => {
+ ast::FnRetTy::Default(_) => Some(String::new()),
+ ast::FnRetTy::Ty(ref ty) => {
if context.config.version() == Version::One
|| context.config.indent_style() == IndentStyle::Visual
{
fn rewrite_fn_base(
context: &RewriteContext<'_>,
indent: Indent,
- ident: ast::Ident,
+ ident: symbol::Ident,
fn_sig: &FnSig<'_>,
span: Span,
fn_brace_style: FnBraceStyle,
}
// Return type.
- if let ast::FunctionRetTy::Ty(..) = fd.output {
+ if let ast::FnRetTy::Ty(..) = fd.output {
let ret_should_indent = match context.config.indent_style() {
// If our params are block layout then we surely must have space.
IndentStyle::Block if put_params_in_block || fd.inputs.is_empty() => false,
}
let pos_before_where = match fd.output {
- ast::FunctionRetTy::Default(..) => params_span.hi(),
- ast::FunctionRetTy::Ty(ref ty) => ty.span.hi(),
+ ast::FnRetTy::Default(..) => params_span.hi(),
+ ast::FnRetTy::Ty(ref ty) => ty.span.hi(),
};
let is_params_multi_lined = param_str.contains('\n');
// If there are neither where-clause nor return type, we may be missing comments between
// params and `{`.
if where_clause_str.is_empty() {
- if let ast::FunctionRetTy::Default(ret_span) = fd.output {
+ if let ast::FnRetTy::Default(ret_span) = fd.output {
match recover_missing_comment_in_span(
mk_sp(params_span.hi(), ret_span.hi()),
shape,
result.push_str(&where_clause_str);
force_new_line_for_brace |= last_line_contains_single_line_comment(&result);
- force_new_line_for_brace |= is_params_multi_lined && context.config.where_single_line();
+ force_new_line_for_brace |=
+ is_params_multi_lined && context.config.where_single_line() && !where_clause_str.is_empty();
Some((result, force_new_line_for_brace))
}
fn format_header(
context: &RewriteContext<'_>,
item_name: &str,
- ident: ast::Ident,
+ ident: symbol::Ident,
vis: &ast::Visibility,
) -> String {
format!(
let span = mk_sp(self.span.lo(), self.span.hi() - BytePos(1));
let item_str = match self.kind {
- ast::ForeignItemKind::Fn(ref fn_sig, ref generics, _) => rewrite_fn_base(
+ ast::ForeignItemKind::Fn(_, ref fn_sig, ref generics, _) => rewrite_fn_base(
context,
shape.indent,
self.ident,
FnBraceStyle::None,
)
.map(|(s, _)| format!("{};", s)),
- ast::ForeignItemKind::Static(ref ty, mutability) => {
+ ast::ForeignItemKind::Static(ref ty, mutability, _) => {
// FIXME(#21): we're dropping potential comments in between the
// function kw here.
let vis = format_visibility(context, &self.vis);
// 1 = ;
rewrite_assign_rhs(context, prefix, &**ty, shape.sub_width(1)?).map(|s| s + ";")
}
- ast::ForeignItemKind::Ty => {
- let vis = format_visibility(context, &self.vis);
- Some(format!(
- "{}type {};",
- vis,
- rewrite_ident(context, self.ident)
- ))
- }
- ast::ForeignItemKind::Macro(ref mac) => {
+ ast::ForeignItemKind::TyAlias(
+ _,
+ ref generics,
+ ref generic_bounds,
+ ref type_default,
+ ) => rewrite_type_alias(
+ self.ident,
+ type_default.as_ref(),
+ generics,
+ Some(generic_bounds),
+ &context,
+ shape.indent,
+ &self.vis,
+ ),
+ ast::ForeignItemKind::MacCall(ref mac) => {
rewrite_macro(mac, None, context, shape, MacroPosition::Item)
}
}?;
projects / rust.git / blobdiff