mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Format exitential type

Browse Source
This commit is contained in:
Seiichi Uchida 2018-07-25 00:30:01 +09:00
parent 6eb0bf2bb9
commit fc307ff582
2 changed files with 107 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

115
src/items.rs
View File

@ -1400,36 +1400,27 @@ fn format_tuple_struct(
Some(result)
}
pub fn rewrite_type_alias(
fn rewrite_type_prefix(
context: &RewriteContext,
indent: Indent,
prefix: &str,
ident: ast::Ident,
ty: &ast::Ty,
generics: &ast::Generics,
vis: &ast::Visibility,
span: Span,
) -> Option<String> {
let mut result = String::with_capacity(128);
result.push_str(&format_visibility(context, vis));
result.push_str("type ");
result.push_str(prefix);
let ident_str = rewrite_ident(context, ident);
// 2 = `= `
let g_shape = Shape::indented(indent, context.config)
.offset_left(result.len())?
.sub_width(2)?;
let g_span = mk_sp(
context.snippet_provider.span_after(span, "type"),
ty.span.lo(),
);
let generics_str = rewrite_generics(
context,
rewrite_ident(context, ident),
generics,
g_shape,
g_span,
)?;
result.push_str(&generics_str);
if generics.params.is_empty() {
result.push_str(ident_str)
} else {
let g_shape = Shape::indented(indent, context.config)
.offset_left(result.len())?
.sub_width(2)?;
let generics_str = rewrite_generics(context, ident_str, generics, g_shape, generics.span)?;
result.push_str(&generics_str);
}
let where_budget = context.budget(last_line_width(&result));
let option = WhereClauseOption::snuggled(&result);
@ -1440,24 +1431,76 @@ pub fn rewrite_type_alias(
Shape::legacy(where_budget, indent),
Density::Vertical,
"=",
Some(span.hi()),
None,
generics.span.hi(),
option,
false,
)?;
result.push_str(&where_clause_str);
if where_clause_str.is_empty() {
result.push_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 generics.where_clause.predicates.is_empty() {
result.push_str(suffix);
} else {
result.push_str(&format!(
"{}=",
indent.to_string_with_newline(context.config)
));
result.push_str(&indent.to_string_with_newline(context.config));
result.push_str(suffix.trim_left());
}
// 1 = ";"
let ty_shape = Shape::indented(indent, context.config).sub_width(1)?;
rewrite_assign_rhs(context, result, ty, ty_shape).map(|s| s + ";")
let rhs_shape = Shape::indented(indent, context.config).sub_width(1)?;
rewrite_assign_rhs(context, result, rhs, rhs_shape).map(|s| s + ";")
}
pub 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 fn rewrite_existential_type(
context: &RewriteContext,
indent: Indent,
ident: ast::Ident,
generic_bounds: &ast::GenericBounds,
generics: &ast::Generics,
vis: &ast::Visibility,
) -> Option<String> {
rewrite_type_item(
context,
indent,
"existential type",
":",
ident,
generic_bounds,
generics,
vis,
)
}
fn type_annotation_spacing(config: &Config) -> (&str, &str) {
@ -1706,6 +1749,16 @@ pub fn rewrite_associated_type(
}
}
pub fn rewrite_existential_impl_type(
context: &RewriteContext,
ident: ast::Ident,
generic_bounds: &ast::GenericBounds,
indent: Indent,
) -> Option<String> {
rewrite_associated_type(ident, None, Some(generic_bounds), context, indent)
.map(|s| format!("existential {}", s))
}
pub fn rewrite_associated_impl_type(
ident: ast::Ident,
defaultness: ast::Defaultness,

26
src/visitor.rs
View File

@ -19,8 +19,9 @@ use comment::{CodeCharKind, CommentCodeSlices, FindUncommented};
use config::{BraceStyle, Config};
use items::{
format_impl, format_trait, format_trait_alias, is_mod_decl, is_use_item,
rewrite_associated_impl_type, rewrite_associated_type, rewrite_extern_crate,
rewrite_type_alias, FnSig, StaticParts, StructParts,
rewrite_associated_impl_type, rewrite_associated_type, rewrite_existential_impl_type,
rewrite_existential_type, rewrite_extern_crate, rewrite_type_alias, FnSig, StaticParts,
StructParts,
};
use macros::{rewrite_macro, rewrite_macro_def, MacroPosition};
use rewrite::{Rewrite, RewriteContext};
@ -412,7 +413,17 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
ty,
generics,
&item.vis,
item.span,
);
self.push_rewrite(item.span, rewrite);
}
ast::ItemKind::Existential(ref generic_bounds, ref generics) => {
let rewrite = rewrite_existential_type(
&self.get_context(),
self.block_indent,
item.ident,
generic_bounds,
generics,
&item.vis,
);
self.push_rewrite(item.span, rewrite);
}
@ -510,6 +521,15 @@ impl<'b, 'a: 'b> FmtVisitor<'a> {
);
self.push_rewrite(ii.span, rewrite);
}
ast::ImplItemKind::Existential(ref generic_bounds) => {
let rewrite = rewrite_existential_impl_type(
&self.get_context(),
ii.ident,
generic_bounds,
self.block_indent,
);
self.push_rewrite(ii.span, rewrite);
}
ast::ImplItemKind::Macro(ref mac) => {
self.visit_mac(mac, Some(ii.ident), MacroPosition::Item);
}