Skip to content
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.

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

deps: Update syntex_syntax to 0.32.0 #979

Merged
merged 1 commit into from
May 5, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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

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
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.31"
syntex_syntax = "0.32"
log = "0.3"
env_logger = "0.3"
getopts = "0.2"
2 changes: 1 addition & 1 deletion src/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ impl Rewrite for ast::Expr {
};
wrap_str(format!("break{}", id_str), context.config.max_width, width, offset)
}
ast::ExprKind::Closure(capture, ref fn_decl, ref body) => {
ast::ExprKind::Closure(capture, ref fn_decl, ref body, _) => {
rewrite_closure(capture, fn_decl, body, self.span, context, width, offset)
}
ast::ExprKind::Field(..) |
Expand Down
6 changes: 3 additions & 3 deletions src/items.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1061,7 +1061,7 @@ pub fn rewrite_associated_type(ident: ast::Ident,
let prefix = format!("type {}", ident);

let type_bounds_str = if let Some(ty_param_bounds) = ty_param_bounds_opt {
let bounds: &[_] = &ty_param_bounds.as_slice();
let bounds: &[_] = &ty_param_bounds;
let bound_str = bounds.iter()
.filter_map(|ty_bound| ty_bound.rewrite(context, context.config.max_width, indent))
.collect::<Vec<String>>()
Expand Down Expand Up @@ -1188,7 +1188,7 @@ pub fn span_hi_for_arg(arg: &ast::Arg) -> BytePos {

pub fn is_named_arg(arg: &ast::Arg) -> bool {
if let ast::PatKind::Ident(_, ident, _) = arg.pat.node {
ident.node != token::special_idents::invalid
ident.node != token::keywords::Invalid.ident()
} else {
true
}
Expand Down Expand Up @@ -1704,7 +1704,7 @@ fn rewrite_trait_bounds(context: &RewriteContext,
indent: Indent,
width: usize)
-> Option<String> {
let bounds: &[_] = &type_param_bounds.as_slice();
let bounds: &[_] = &type_param_bounds;

if bounds.is_empty() {
return Some(String::new());
Expand Down
2 changes: 1 addition & 1 deletion src/utils.rs
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ pub fn format_visibility(vis: &Visibility) -> Option<&'static str> {
Visibility::Public => Some("pub "),
Visibility::Inherited => Some(""),
// FIXME(#970): Handle new visibility types.
Visibility::Crate => None,
Visibility::Crate(_) => None,
Visibility::Restricted { .. } => None,
}
}
Expand Down