// foo!( x, y, z ). The token x may represent an identifier in the code, but we
// interpreted as an expression.
// Macro uses which are not-list like, such as bar!(key => val), will not be
-// reformated.
+// reformatted.
// List-like invocations with parentheses will be formatted as function calls,
// and those with brackets will be formatted as array literals.
use syntax::tokenstream::TokenStream;
use syntax::util::ThinVec;
-use {Indent, Shape};
use codemap::SpanUtils;
use comment::{contains_comment, FindUncommented};
use expr::{rewrite_array, rewrite_call_inner};
use rewrite::{Rewrite, RewriteContext};
+use shape::{Indent, Shape};
use utils::mk_sp;
-const FORCED_BRACKET_MACROS: &'static [&'static str] = &["vec!"];
+const FORCED_BRACKET_MACROS: &[&str] = &["vec!"];
// FIXME: use the enum from libsyntax?
#[derive(Clone, Copy, PartialEq, Eq)]
Item,
Statement,
Expression,
+ Pat,
}
impl MacroStyle {
impl Rewrite for MacroArg {
fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option<String> {
- match self {
- &MacroArg::Expr(ref expr) => expr.rewrite(context, shape),
- &MacroArg::Ty(ref ty) => ty.rewrite(context, shape),
- &MacroArg::Pat(ref pat) => pat.rewrite(context, shape),
+ match *self {
+ MacroArg::Expr(ref expr) => expr.rewrite(context, shape),
+ MacroArg::Ty(ref ty) => ty.rewrite(context, shape),
+ MacroArg::Pat(ref pat) => pat.rewrite(context, shape),
}
}
}
context.inside_macro = true;
if context.config.use_try_shorthand() {
if let Some(expr) = convert_try_mac(mac, context) {
+ context.inside_macro = false;
return expr.rewrite(context, shape);
}
}
let macro_name = match extra_ident {
None => format!("{}!", mac.node.path),
- Some(ident) => if ident == symbol::keywords::Invalid.ident() {
- format!("{}!", mac.node.path)
- } else {
- format!("{}! {}", mac.node.path, ident)
- },
+ Some(ident) => {
+ if ident == symbol::keywords::Invalid.ident() {
+ format!("{}!", mac.node.path)
+ } else {
+ format!("{}! {}", mac.node.path, ident)
+ }
+ }
};
let style = if FORCED_BRACKET_MACROS.contains(&¯o_name[..]) {
};
let ts: TokenStream = mac.node.stream();
- if ts.is_empty() && !contains_comment(&context.snippet(mac.span)) {
+ if ts.is_empty() && !contains_comment(context.snippet(mac.span)) {
return match style {
MacroStyle::Parens if position == MacroPosition::Item => {
Some(format!("{}();", macro_name))
loop {
match parse_macro_arg(&mut parser) {
Some(arg) => arg_vec.push(arg),
- None => return Some(context.snippet(mac.span)),
+ None => return Some(context.snippet(mac.span).to_owned()),
}
match parser.token {
break;
}
}
- None => return Some(context.snippet(mac.span)),
+ None => return Some(context.snippet(mac.span).to_owned()),
}
}
}
- return Some(context.snippet(mac.span));
+ return Some(context.snippet(mac.span).to_owned());
}
- _ => return Some(context.snippet(mac.span)),
+ _ => return Some(context.snippet(mac.span).to_owned()),
}
parser.bump();
MacroStyle::Parens => {
// Format macro invocation as function call, forcing no trailing
// comma because not all macros support them.
- let rw = rewrite_call_inner(
+ rewrite_call_inner(
context,
¯o_name,
&arg_vec.iter().map(|e| &*e).collect::<Vec<_>>()[..],
mac.span,
shape,
- context.config.fn_call_width(),
+ context.config.width_heuristics().fn_call_width,
trailing_comma,
- );
- rw.ok().map(|rw| match position {
+ ).map(|rw| match position {
MacroPosition::Item => format!("{};", rw),
_ => rw,
})
}
MacroStyle::Brackets => {
- let mac_shape = try_opt!(shape.offset_left(macro_name.len()));
+ let mac_shape = shape.offset_left(macro_name.len())?;
// Handle special case: `vec![expr; expr]`
if vec_with_semi {
- let (lbr, rbr) = if context.config.spaces_within_square_brackets() {
+ let (lbr, rbr) = if context.config.spaces_within_parens_and_brackets() {
("[ ", " ]")
} else {
("[", "]")
// 6 = `vec!` + `; `
let total_overhead = lbr.len() + rbr.len() + 6;
let nested_shape = mac_shape.block_indent(context.config.tab_spaces());
- let lhs = try_opt!(arg_vec[0].rewrite(context, nested_shape));
- let rhs = try_opt!(arg_vec[1].rewrite(context, nested_shape));
- if !lhs.contains('\n') && !rhs.contains('\n') &&
- lhs.len() + rhs.len() + total_overhead <= shape.width
+ let lhs = arg_vec[0].rewrite(context, nested_shape)?;
+ let rhs = arg_vec[1].rewrite(context, nested_shape)?;
+ if !lhs.contains('\n') && !rhs.contains('\n')
+ && lhs.len() + rhs.len() + total_overhead <= shape.width
{
Some(format!("{}{}{}; {}{}", macro_name, lbr, lhs, rhs, rbr))
} else {
trailing_comma = false;
}
// Convert `MacroArg` into `ast::Expr`, as `rewrite_array` only accepts the latter.
- let expr_vec: Vec<_> = arg_vec
- .iter()
- .filter_map(|e| match *e {
- MacroArg::Expr(ref e) => Some(e.clone()),
- _ => None,
- })
- .collect();
- if expr_vec.len() != arg_vec.len() {
- return Some(context.snippet(mac.span));
- }
let sp = mk_sp(
context
.codemap
.span_after(mac.span, original_style.opener()),
mac.span.hi() - BytePos(1),
);
- let rewrite = try_opt!(rewrite_array(
- expr_vec.iter(),
- sp,
- context,
- mac_shape,
- trailing_comma,
- ));
+ let arg_vec = &arg_vec.iter().map(|e| &*e).collect::<Vec<_>>()[..];
+ let rewrite = rewrite_array(arg_vec, sp, context, mac_shape, trailing_comma)?;
Some(format!("{}{}", macro_name, rewrite))
}
}
MacroStyle::Braces => {
// Skip macro invocations with braces, for now.
- indent_macro_snippet(context, &context.snippet(mac.span), shape.indent)
+ indent_macro_snippet(context, context.snippet(mac.span), shape.indent)
}
}
}
Some(ast::Expr {
id: ast::NodeId::new(0), // dummy value
- node: ast::ExprKind::Try(try_opt!(parser.parse_expr().ok())),
+ node: ast::ExprKind::Try(parser.parse_expr().ok()?),
span: mac.span, // incorrect span, but shouldn't matter too much
attrs: ThinVec::new(),
})
indent: Indent,
) -> Option<String> {
let mut lines = macro_str.lines();
- let first_line = try_opt!(lines.next().map(|s| s.trim_right()));
+ let first_line = lines.next().map(|s| s.trim_right())?;
let mut trimmed_lines = Vec::with_capacity(16);
- let min_prefix_space_width = try_opt!(
- lines
- .filter_map(|line| {
- let prefix_space_width = if is_empty_line(line) {
- None
- } else {
- Some(get_prefix_space_width(context, line))
- };
- trimmed_lines.push((line.trim(), prefix_space_width));
- prefix_space_width
- })
- .min()
- );
+ let min_prefix_space_width = lines
+ .filter_map(|line| {
+ let prefix_space_width = if is_empty_line(line) {
+ None
+ } else {
+ Some(get_prefix_space_width(context, line))
+ };
+ trimmed_lines.push((line.trim(), prefix_space_width));
+ prefix_space_width
+ })
+ .min()?;
Some(
- String::from(first_line) + "\n" +
- &trimmed_lines
+ String::from(first_line) + "\n"
+ + &trimmed_lines
.iter()
.map(|&(line, prefix_space_width)| match prefix_space_width {
Some(original_indent_width) => {
- let new_indent_width = indent.width() +
- original_indent_width
+ let new_indent_width = indent.width()
+ + original_indent_width
.checked_sub(min_prefix_space_width)
.unwrap_or(0);
let new_indent = Indent::from_width(context.config, new_indent_width);
- new_indent.to_string(context.config) + line.trim()
+ format!("{}{}", new_indent.to_string(context.config), line.trim())
}
None => String::new(),
})
projects / rust.git / blobdiff