Skip to content

Use static strings, season 2 #6658

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

Use static strings, season 2 #6658

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b525ec
Take string slices
sanxiyn May 21, 2013
743e4b0
Use static strings
sanxiyn May 21, 2013
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
22 changes: 11 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 @@ -472,7 +472,7 @@ pub fn print_item(s: @ps, item: @ast::item) {
(s.ann.pre)(ann_node);
match item.node {
ast::item_const(ty, expr) => {
head(s, visibility_qualified(item.vis, ~"static"));
head(s, visibility_qualified(item.vis, "static"));
print_ident(s, item.ident);
word_space(s, ":");
print_type(s, ty);
Expand Down Expand Up @@ -500,15 +500,15 @@ pub fn print_item(s: @ps, item: @ast::item) {
print_block_with_attrs(s, body, item.attrs);
}
ast::item_mod(ref _mod) => {
head(s, visibility_qualified(item.vis, ~"mod"));
head(s, visibility_qualified(item.vis, "mod"));
print_ident(s, item.ident);
nbsp(s);
bopen(s);
print_mod(s, _mod, item.attrs);
bclose(s, item.span);
}
ast::item_foreign_mod(ref nmod) => {
head(s, visibility_qualified(item.vis, ~"extern"));
head(s, visibility_qualified(item.vis, "extern"));
word_nbsp(s, nmod.abis.to_str());
match nmod.sort {
ast::named => {
Expand All @@ -525,7 +525,7 @@ pub fn print_item(s: @ps, item: @ast::item) {
ast::item_ty(ty, ref params) => {
ibox(s, indent_unit);
ibox(s, 0u);
word_nbsp(s, visibility_qualified(item.vis, ~"type"));
word_nbsp(s, visibility_qualified(item.vis, "type"));
print_ident(s, item.ident);
print_generics(s, params);
end(s); // end the inner ibox
Expand All @@ -547,12 +547,12 @@ pub fn print_item(s: @ps, item: @ast::item) {
);
}
ast::item_struct(struct_def, ref generics) => {
head(s, visibility_qualified(item.vis, ~"struct"));
head(s, visibility_qualified(item.vis, "struct"));
print_struct(s, struct_def, generics, item.ident, item.span);
}

ast::item_impl(ref generics, opt_trait, ty, ref methods) => {
head(s, visibility_qualified(item.vis, ~"impl"));
head(s, visibility_qualified(item.vis, "impl"));
if generics.is_parameterized() {
print_generics(s, generics);
space(s.s);
Expand Down Expand Up @@ -581,7 +581,7 @@ pub fn print_item(s: @ps, item: @ast::item) {
}
}
ast::item_trait(ref generics, ref traits, ref methods) => {
head(s, visibility_qualified(item.vis, ~"trait"));
head(s, visibility_qualified(item.vis, "trait"));
print_ident(s, item.ident);
print_generics(s, generics);
if traits.len() != 0u {
Expand Down Expand Up @@ -624,7 +624,7 @@ fn print_trait_ref(s: @ps, t: &ast::trait_ref) {
pub fn print_enum_def(s: @ps, enum_definition: &ast::enum_def,
generics: &ast::Generics, ident: ast::ident,
span: codemap::span, visibility: ast::visibility) {
head(s, visibility_qualified(visibility, ~"enum"));
head(s, visibility_qualified(visibility, "enum"));
print_ident(s, ident);
print_generics(s, generics);
space(s.s);
Expand Down Expand Up @@ -656,10 +656,10 @@ pub fn visibility_to_str(vis: ast::visibility) -> ~str {
}
}

pub fn visibility_qualified(vis: ast::visibility, s: ~str) -> ~str {
pub fn visibility_qualified(vis: ast::visibility, s: &str) -> ~str {
match vis {
ast::private | ast::public => visibility_to_str(vis) + " " + s,
ast::inherited => copy s
ast::inherited => s.to_owned()
}
}

Expand Down Expand Up @@ -2169,7 +2169,7 @@ pub fn print_fn_header_info(s: @ps,
onceness: ast::Onceness,
opt_sigil: Option<ast::Sigil>,
vis: ast::visibility) {
word(s.s, visibility_qualified(vis, ~""));
word(s.s, visibility_qualified(vis, ""));

if abis != AbiSet::Rust() {
word_nbsp(s, "extern");
Expand Down