Skip to content

fix indentations and remove duplicate visibilities #3698

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix indentations and remove duplicate visibilities #3698

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e4f267
fix the indentation of foreign constant
crabtw Oct 8, 2012
8531b6d
remove duplicate visibility and fix indentation
crabtw Oct 14, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 12 additions & 11 deletions src/libsyntax/print/pprust.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,7 @@ fn print_foreign_item(s: ps, item: @ast::foreign_item) {
print_type(s, t);
word(s.s, ~";");
end(s); // end the head-ibox
end(s); // end the outer cbox
}
}
}
Expand All @@ -443,7 +444,6 @@ fn print_item(s: ps, &&item: @ast::item) {
print_outer_attributes(s, item.attrs);
let ann_node = node_item(s, item);
s.ann.pre(ann_node);
print_visibility(s, item.vis);
match item.node {
ast::item_const(ty, expr) => {
head(s, visibility_qualified(item.vis, ~"const"));
Expand Down Expand Up @@ -479,18 +479,18 @@ fn print_item(s: ps, &&item: @ast::item) {
ast::named => {
word_nbsp(s, ~"mod");
print_ident(s, item.ident);
nbsp(s);
}
ast::anonymous => {}
}
nbsp(s);
bopen(s);
print_foreign_mod(s, nmod, item.attrs);
bclose(s, item.span);
}
ast::item_ty(ty, params) => {
ibox(s, indent_unit);
ibox(s, 0u);
word_nbsp(s, ~"type");
word_nbsp(s, visibility_qualified(item.vis, ~"type"));
print_ident(s, item.ident);
print_type_params(s, params);
end(s); // end the inner ibox
Expand All @@ -502,15 +502,15 @@ fn print_item(s: ps, &&item: @ast::item) {
end(s); // end the outer ibox
}
ast::item_enum(enum_definition, params) => {
print_enum_def(s, enum_definition, params, item.ident, item.span);
print_enum_def(s, enum_definition, params, item.ident, item.span, item.vis);
}
ast::item_class(struct_def, tps) => {
head(s, ~"struct");
head(s, visibility_qualified(item.vis, ~"struct"));
print_struct(s, struct_def, tps, item.ident, item.span);
}

ast::item_impl(tps, opt_trait, ty, methods) => {
head(s, ~"impl");
head(s, visibility_qualified(item.vis, ~"impl"));
if tps.is_not_empty() {
print_type_params(s, tps);
space(s.s);
Expand All @@ -533,7 +533,7 @@ fn print_item(s: ps, &&item: @ast::item) {
bclose(s, item.span);
}
ast::item_trait(tps, traits, methods) => {
head(s, ~"trait");
head(s, visibility_qualified(item.vis, ~"trait"));
print_ident(s, item.ident);
print_type_params(s, tps);
if vec::len(traits) != 0u {
Expand All @@ -549,6 +549,7 @@ fn print_item(s: ps, &&item: @ast::item) {
bclose(s, item.span);
}
ast::item_mac({node: ast::mac_invoc_tt(pth, tts), _}) => {
print_visibility(s, item.vis);
print_path(s, pth, false);
word(s.s, ~"! ");
print_ident(s, item.ident);
Expand All @@ -569,7 +570,7 @@ fn print_item(s: ps, &&item: @ast::item) {

fn print_enum_def(s: ps, enum_definition: ast::enum_def,
params: ~[ast::ty_param], ident: ast::ident,
span: ast::span) {
span: ast::span, visibility: ast::visibility) {
let mut newtype =
vec::len(enum_definition.variants) == 1u &&
ident == enum_definition.variants[0].node.name;
Expand All @@ -581,9 +582,9 @@ fn print_enum_def(s: ps, enum_definition: ast::enum_def,
}
if newtype {
ibox(s, indent_unit);
word_space(s, ~"enum");
word_space(s, visibility_qualified(visibility, ~"enum"));
} else {
head(s, ~"enum");
head(s, visibility_qualified(visibility, ~"enum"));
}

print_ident(s, ident);
Expand Down Expand Up @@ -888,7 +889,7 @@ fn print_possibly_embedded_block_(s: ps, blk: ast::blk, embedded: embed_type,
indented: uint, attrs: ~[ast::attribute],
close_box: bool) {
match blk.node.rules {
ast::unsafe_blk => word(s.s, ~"unsafe"),
ast::unsafe_blk => word(s.s, ~"unsafe "),
ast::default_blk => ()
}
maybe_print_comment(s, blk.span.lo);
Expand Down