Skip to content

deps: Update syntex_syntax to 0.31.0 #971

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

Merged
merged 2 commits into from
May 2, 2016
Merged

deps: Update syntex_syntax to 0.31.0 #971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd38acb
deps: Update syntex_syntax to 0.31.0
kamalmarhubi May 2, 2016
6285d53
Handle new visibility types more gracefully
kamalmarhubi May 2, 2016
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
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ regex = "0.1"
term = "0.4"
strings = "0.0.1"
diff = "0.1"
syntex_syntax = "0.30"
syntex_syntax = "0.31"
log = "0.3"
env_logger = "0.3"
getopts = "0.2"
89 changes: 43 additions & 46 deletions src/items.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ impl<'a> FmtVisitor<'a> {
// These are not actually rust functions,
// but we format them as such.
abi::Abi::Rust,
item.vis,
&item.vis,
span,
false,
false);
Expand All @@ -142,15 +142,16 @@ impl<'a> FmtVisitor<'a> {
ast::ForeignItemKind::Static(ref ty, is_mutable) => {
// FIXME(#21): we're dropping potential comments in between the
// function keywords here.
let vis = match format_visibility(&item.vis) {
Some(s) => s,
None => return,
};
let mut_str = if is_mutable {
"mut "
} else {
""
};
let prefix = format!("{}static {}{}: ",
format_visibility(item.vis),
mut_str,
item.ident);
let prefix = format!("{}static {}{}: ", vis, mut_str, item.ident);
let offset = self.block_indent + prefix.len();
// 1 = ;
let width = self.config.max_width - offset.width() - 1;
Expand Down Expand Up @@ -179,7 +180,7 @@ impl<'a> FmtVisitor<'a> {
unsafety: ast::Unsafety,
constness: ast::Constness,
abi: abi::Abi,
vis: ast::Visibility,
vis: &ast::Visibility,
span: Span,
block: &ast::Block)
-> Option<String> {
Expand Down Expand Up @@ -244,7 +245,7 @@ impl<'a> FmtVisitor<'a> {
sig.unsafety,
sig.constness,
sig.abi,
ast::Visibility::Inherited,
&ast::Visibility::Inherited,
span,
false,
false));
Expand Down Expand Up @@ -303,11 +304,14 @@ impl<'a> FmtVisitor<'a> {

pub fn visit_enum(&mut self,
ident: ast::Ident,
vis: ast::Visibility,
vis: &ast::Visibility,
enum_def: &ast::EnumDef,
generics: &ast::Generics,
span: Span) {
let header_str = format_header("enum ", ident, vis);
let header_str = match format_header("enum ", ident, vis) {
Some(s) => s,
None => return,
};
self.buffer.push_str(&header_str);

let enum_snippet = self.snippet(span);
Expand Down Expand Up @@ -414,7 +418,7 @@ impl<'a> FmtVisitor<'a> {
format_struct(&context,
"",
field.node.name,
ast::Visibility::Inherited,
&ast::Visibility::Inherited,
&field.node.data,
None,
field.span,
Expand Down Expand Up @@ -451,7 +455,7 @@ pub fn format_impl(context: &RewriteContext, item: &ast::Item, offset: Indent) -
ref self_ty,
ref items) = item.node {
let mut result = String::new();
result.push_str(format_visibility(item.vis));
result.push_str(try_opt!(format_visibility(&item.vis)));
result.push_str(format_unsafety(unsafety));
result.push_str("impl");

Expand Down Expand Up @@ -583,7 +587,7 @@ fn is_impl_single_line(context: &RewriteContext,
pub fn format_struct(context: &RewriteContext,
item_name: &str,
ident: ast::Ident,
vis: ast::Visibility,
vis: &ast::Visibility,
struct_def: &ast::VariantData,
generics: Option<&ast::Generics>,
span: Span,
Expand Down Expand Up @@ -619,7 +623,7 @@ pub fn format_trait(context: &RewriteContext, item: &ast::Item, offset: Indent)
item.node {
let mut result = String::new();
let header = format!("{}{}trait {}",
format_visibility(item.vis),
try_opt!(format_visibility(&item.vis)),
format_unsafety(unsafety),
item.ident);

Expand Down Expand Up @@ -741,10 +745,10 @@ pub fn format_trait(context: &RewriteContext, item: &ast::Item, offset: Indent)
}
}

fn format_unit_struct(item_name: &str, ident: ast::Ident, vis: ast::Visibility) -> Option<String> {
fn format_unit_struct(item_name: &str, ident: ast::Ident, vis: &ast::Visibility) -> Option<String> {
let mut result = String::with_capacity(1024);

let header_str = format_header(item_name, ident, vis);
let header_str = try_opt!(format_header(item_name, ident, vis));
result.push_str(&header_str);
result.push(';');

Expand All @@ -754,15 +758,15 @@ fn format_unit_struct(item_name: &str, ident: ast::Ident, vis: ast::Visibility)
fn format_struct_struct(context: &RewriteContext,
item_name: &str,
ident: ast::Ident,
vis: ast::Visibility,
vis: &ast::Visibility,
fields: &[ast::StructField],
generics: Option<&ast::Generics>,
span: Span,
offset: Indent)
-> Option<String> {
let mut result = String::with_capacity(1024);

let header_str = format_header(item_name, ident, vis);
let header_str = try_opt!(format_header(item_name, ident, vis));
result.push_str(&header_str);

let body_lo = context.codemap.span_after(span, "{");
Expand Down Expand Up @@ -804,13 +808,13 @@ fn format_struct_struct(context: &RewriteContext,
"}",
|field| {
// Include attributes and doc comments, if present
if !field.node.attrs.is_empty() {
field.node.attrs[0].span.lo
if !field.attrs.is_empty() {
field.attrs[0].span.lo
} else {
field.span.lo
}
},
|field| field.node.ty.span.hi,
|field| field.ty.span.hi,
|field| field.rewrite(context, item_budget, item_indent),
context.codemap.span_after(span, "{"),
span.hi);
Expand All @@ -835,15 +839,15 @@ fn format_struct_struct(context: &RewriteContext,
fn format_tuple_struct(context: &RewriteContext,
item_name: &str,
ident: ast::Ident,
vis: ast::Visibility,
vis: &ast::Visibility,
fields: &[ast::StructField],
generics: Option<&ast::Generics>,
span: Span,
offset: Indent)
-> Option<String> {
let mut result = String::with_capacity(1024);

let header_str = format_header(item_name, ident, vis);
let header_str = try_opt!(format_header(item_name, ident, vis));
result.push_str(&header_str);

// FIXME(#919): don't lose comments on empty tuple structs.
Expand Down Expand Up @@ -890,13 +894,13 @@ fn format_tuple_struct(context: &RewriteContext,
")",
|field| {
// Include attributes and doc comments, if present
if !field.node.attrs.is_empty() {
field.node.attrs[0].span.lo
if !field.attrs.is_empty() {
field.attrs[0].span.lo
} else {
field.span.lo
}
},
|field| field.node.ty.span.hi,
|field| field.ty.span.hi,
|field| field.rewrite(context, item_budget, item_indent),
context.codemap.span_after(span, "("),
span.hi);
Expand Down Expand Up @@ -924,12 +928,12 @@ pub fn rewrite_type_alias(context: &RewriteContext,
ident: ast::Ident,
ty: &ast::Ty,
generics: &ast::Generics,
vis: ast::Visibility,
vis: &ast::Visibility,
span: Span)
-> Option<String> {
let mut result = String::new();

result.push_str(&format_visibility(vis));
result.push_str(&try_opt!(format_visibility(&vis)));
result.push_str("type ");
result.push_str(&ident.to_string());

Expand Down Expand Up @@ -991,21 +995,14 @@ pub fn rewrite_type_alias(context: &RewriteContext,

impl Rewrite for ast::StructField {
fn rewrite(&self, context: &RewriteContext, width: usize, offset: Indent) -> Option<String> {
if contains_skip(&self.node.attrs) {
let span = context.snippet(mk_sp(self.node.attrs[0].span.lo, self.span.hi));
if contains_skip(&self.attrs) {
let span = context.snippet(mk_sp(self.attrs[0].span.lo, self.span.hi));
return wrap_str(span, context.config.max_width, width, offset);
}

let name = match self.node.kind {
ast::StructFieldKind::NamedField(ident, _) => Some(ident.to_string()),
ast::StructFieldKind::UnnamedField(_) => None,
};
let vis = match self.node.kind {
ast::StructFieldKind::NamedField(_, vis) |
ast::StructFieldKind::UnnamedField(vis) => format_visibility(vis),
};
let mut attr_str = try_opt!(self.node
.attrs
let name = self.ident;
let vis = try_opt!(format_visibility(&self.vis));
let mut attr_str = try_opt!(self.attrs
.rewrite(context, context.config.max_width - offset.width(), offset));
if !attr_str.is_empty() {
attr_str.push('\n');
Expand All @@ -1019,21 +1016,21 @@ impl Rewrite for ast::StructField {

let last_line_width = last_line_width(&result);
let budget = try_opt!(width.checked_sub(last_line_width));
let rewrite = try_opt!(self.node.ty.rewrite(context, budget, offset + last_line_width));
let rewrite = try_opt!(self.ty.rewrite(context, budget, offset + last_line_width));
Some(result + &rewrite)
}
}

pub fn rewrite_static(prefix: &str,
vis: ast::Visibility,
vis: &ast::Visibility,
ident: ast::Ident,
ty: &ast::Ty,
mutability: ast::Mutability,
expr_opt: Option<&ptr::P<ast::Expr>>,
context: &RewriteContext)
-> Option<String> {
let prefix = format!("{}{} {}{}: ",
format_visibility(vis),
try_opt!(format_visibility(vis)),
prefix,
format_mutability(mutability),
ident);
Expand Down Expand Up @@ -1239,7 +1236,7 @@ fn rewrite_fn_base(context: &RewriteContext,
unsafety: ast::Unsafety,
constness: ast::Constness,
abi: abi::Abi,
vis: ast::Visibility,
vis: &ast::Visibility,
span: Span,
newline_brace: bool,
has_body: bool)
Expand All @@ -1252,7 +1249,7 @@ fn rewrite_fn_base(context: &RewriteContext,

let mut result = String::with_capacity(1024);
// Vis unsafety abi.
result.push_str(format_visibility(vis));
result.push_str(try_opt!(format_visibility(vis)));

if let ast::Constness::Const = constness {
result.push_str("const ");
Expand Down Expand Up @@ -1808,8 +1805,8 @@ fn rewrite_where_clause(context: &RewriteContext,
}
}

fn format_header(item_name: &str, ident: ast::Ident, vis: ast::Visibility) -> String {
format!("{}{}{}", format_visibility(vis), item_name, ident)
fn format_header(item_name: &str, ident: ast::Ident, vis: &ast::Visibility) -> Option<String> {
Some(format!("{}{}{}", try_opt!(format_visibility(vis)), item_name, ident))
}

fn format_generics(context: &RewriteContext,
Expand Down
11 changes: 7 additions & 4 deletions src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,13 @@ pub fn extra_offset(text: &str, offset: Indent) -> usize {
}

#[inline]
pub fn format_visibility(vis: Visibility) -> &'static str {
match vis {
Visibility::Public => "pub ",
Visibility::Inherited => "",
pub fn format_visibility(vis: &Visibility) -> Option<&'static str> {
match *vis {
Visibility::Public => Some("pub "),
Visibility::Inherited => Some(""),
// FIXME(#970): Handle new visibility types.
Visibility::Crate => None,
Visibility::Restricted { .. } => None,
}
}

Expand Down
Loading