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

Merge pull request #332 from Kha/variant_no_vis

Browse Source 
rustc update: Remove variant visibility
This commit is contained in:
Marcus Klaas de Vries 2015-09-19 19:19:34 +02:00
commit 4e1fff8710
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/items.rs
View File

@ -507,8 +507,6 @@ fn visit_variant(&mut self, field: &ast::Variant, last_field: bool, next_span_st
let result = match field.node.kind {
ast::VariantKind::TupleVariantKind(ref types) => {
let vis = format_visibility(field.node.vis);
self.buffer.push_str(vis);
let name = field.node.name.to_string();
self.buffer.push_str(&name);
@ -531,8 +529,7 @@ fn visit_variant(&mut self, field: &ast::Variant, last_field: bool, next_span_st
result.push('(');
let indent = self.block_indent + vis.len() + field.node.name.to_string().len() +
1; // Open paren
let indent = self.block_indent + field.node.name.to_string().len() + "(".len();
let comma_cost = if self.config.enum_trailing_comma {
1
@ -565,9 +562,8 @@ fn visit_variant(&mut self, field: &ast::Variant, last_field: bool, next_span_st
result.push_str(&expr_snippet);
// Make sure we do not exceed column limit
// 4 = " = ,"
assert!(self.config.max_width >=
vis.len() + name.len() + expr_snippet.len() + 4,
name.len() + expr_snippet.len() + " = ,".len(),
"Enum variant exceeded column limit");
}
@ -577,7 +573,7 @@ fn visit_variant(&mut self, field: &ast::Variant, last_field: bool, next_span_st
// TODO: Should limit the width, as we have a trailing comma
let struct_rewrite = self.format_struct("",
field.node.name,
field.node.vis,
ast::Visibility::Inherited,
struct_def,
None,
field.span,