X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fexpr.rs;h=674f719b5c74ba8957aece1eb818d6805fb73f29;hb=4568c1a70f64d4ab77f9fd9553d532f0bcbe0d84;hp=909ea46f75d8bb06d7d13e015984b02b2ff6cf29;hpb=04d804c3655eaaa262d1147446290e8fe4aabc67;p=rust.git diff --git a/src/expr.rs b/src/expr.rs index 909ea46f75d..674f719b5c7 100644 --- a/src/expr.rs +++ b/src/expr.rs @@ -12,13 +12,12 @@ use std::cmp::min; use config::lists::*; -use syntax::source_map::{BytePos, SourceMap, Span}; use syntax::parse::token::DelimToken; +use syntax::source_map::{BytePos, SourceMap, Span}; use syntax::{ast, ptr}; use chains::rewrite_chain; use closures; -use source_map::{LineRangeUtils, SpanUtils}; use comment::{ combine_strs_with_missing_comments, contains_comment, recover_comment_removed, rewrite_comment, rewrite_missing_comment, CharClasses, FindUncommented, @@ -35,6 +34,7 @@ use patterns::{can_be_overflowed_pat, is_short_pattern, TuplePatField}; use rewrite::{Rewrite, RewriteContext}; use shape::{Indent, Shape}; +use source_map::{LineRangeUtils, SpanUtils}; use spanned::Spanned; use string::{rewrite_string, StringFormat}; use types::{can_be_overflowed_type, rewrite_path, PathContext}; @@ -100,7 +100,7 @@ pub fn format_expr( ) }) } - ast::ExprKind::Unary(ref op, ref subexpr) => rewrite_unary_op(context, op, subexpr, shape), + ast::ExprKind::Unary(op, ref subexpr) => rewrite_unary_op(context, op, subexpr, shape), ast::ExprKind::Struct(ref path, ref fields, ref base) => rewrite_struct_lit( context, path, @@ -179,11 +179,13 @@ pub fn format_expr( Some(format!("break{}", id_str)) } } - ast::ExprKind::Yield(ref opt_expr) => if let Some(ref expr) = *opt_expr { - rewrite_unary_prefix(context, "yield ", &**expr, shape) - } else { - Some("yield".to_string()) - }, + ast::ExprKind::Yield(ref opt_expr) => { + if let Some(ref expr) = *opt_expr { + rewrite_unary_prefix(context, "yield ", &**expr, shape) + } else { + Some("yield".to_string()) + } + } ast::ExprKind::Closure(capture, asyncness, movability, ref fn_decl, ref body, _) => { closures::rewrite_closure( capture, asyncness, movability, fn_decl, body, expr.span, context, shape, @@ -317,22 +319,17 @@ fn needs_space_after_range(rhs: &ast::Expr) -> bool { // We do not format these expressions yet, but they should still // satisfy our width restrictions. ast::ExprKind::InlineAsm(..) => Some(context.snippet(expr.span).to_owned()), - ast::ExprKind::Catch(ref block) => { - if let rw @ Some(_) = rewrite_single_line_block( - context, - "do catch ", - block, - Some(&expr.attrs), - None, - shape, - ) { + ast::ExprKind::TryBlock(ref block) => { + if let rw @ Some(_) = + rewrite_single_line_block(context, "try ", block, Some(&expr.attrs), None, shape) + { rw } else { - // 9 = `do catch ` + // 9 = `try ` let budget = shape.width.saturating_sub(9); Some(format!( "{}{}", - "do catch ", + "try ", rewrite_block( block, Some(&expr.attrs), @@ -343,8 +340,10 @@ fn needs_space_after_range(rhs: &ast::Expr) -> bool { )) } } - // FIXME(#2743) - ast::ExprKind::ObsoleteInPlace(..) => unimplemented!(), + ast::ExprKind::ObsoleteInPlace(ref lhs, ref rhs) => lhs + .rewrite(context, shape) + .map(|s| s + " <-") + .and_then(|lhs| rewrite_assign_rhs(context, lhs, &**rhs, shape)), ast::ExprKind::Async(capture_by, _node_id, ref block) => { let mover = if capture_by == ast::CaptureBy::Value { "move " @@ -425,7 +424,9 @@ fn rewrite_empty_block( return None; } - if block.stmts.is_empty() && !block_contains_comment(block, context.source_map) && shape.width >= 2 + if block.stmts.is_empty() + && !block_contains_comment(block, context.source_map) + && shape.width >= 2 { return Some(format!("{}{}{{}}", prefix, label_str)); } @@ -1028,7 +1029,8 @@ fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option { false, true, mk_sp(else_block.span.lo(), self.span.hi()), - ).rewrite(context, shape) + ) + .rewrite(context, shape) } ast::ExprKind::If(ref cond, ref if_block, ref next_else_block) => { ControlFlow::new_if( @@ -1039,7 +1041,8 @@ fn rewrite(&self, context: &RewriteContext, shape: Shape) -> Option { false, true, mk_sp(else_block.span.lo(), self.span.hi()), - ).rewrite(context, shape) + ) + .rewrite(context, shape) } _ => { last_in_chain = true; @@ -1236,7 +1239,8 @@ fn rewrite_string_lit(context: &RewriteContext, span: Span, shape: Shape) -> Opt new_indent.to_string(context.config), line.trim_left() ) - }).collect::>() + }) + .collect::>() .join("\n") .trim_left(), ); @@ -1485,7 +1489,12 @@ fn rewrite_index( .offset_left(offset) .and_then(|shape| shape.sub_width(1 + rhs_overhead)) } else { - shape.visual_indent(offset).sub_width(offset + 1) + match context.config.indent_style() { + IndentStyle::Block => shape + .offset_left(offset) + .and_then(|shape| shape.sub_width(1)), + IndentStyle::Visual => shape.visual_indent(offset).sub_width(offset + 1), + } }; let orig_index_rw = index_shape.and_then(|s| index.rewrite(context, s)); @@ -1520,7 +1529,7 @@ fn rewrite_index( } } -fn struct_lit_can_be_aligned(fields: &[ast::Field], base: &Option<&ast::Expr>) -> bool { +fn struct_lit_can_be_aligned(fields: &[ast::Field], base: Option<&ast::Expr>) -> bool { if base.is_some() { return false; } @@ -1556,7 +1565,7 @@ enum StructLitField<'a> { let one_line_width = h_shape.map_or(0, |shape| shape.width); let body_lo = context.snippet_provider.span_after(span, "{"); - let fields_str = if struct_lit_can_be_aligned(fields, &base) + let fields_str = if struct_lit_can_be_aligned(fields, base) && context.config.struct_field_align_threshold() > 0 { rewrite_with_alignment( @@ -1677,7 +1686,7 @@ pub fn rewrite_field( }; let name = context.snippet(field.ident.span); if field.is_shorthand { - Some(attrs_str + &name) + Some(attrs_str + name) } else { let mut separator = String::from(struct_lit_field_separator(context.config)); for _ in 0..prefix_max_width.saturating_sub(name.len()) { @@ -1689,7 +1698,7 @@ pub fn rewrite_field( match expr { Some(ref e) if e.as_str() == name && context.config.use_field_init_shorthand() => { - Some(attrs_str + &name) + Some(attrs_str + name) } Some(e) => Some(format!("{}{}{}{}", attrs_str, name, separator, e)), None => { @@ -1754,7 +1763,7 @@ fn rewrite_tuple_in_visual_indent_style<'a, T>( Separator::Comma, nested_shape.width, ); - let fmt = ListFormatting::new(shape, context.config) + let fmt = ListFormatting::new(nested_shape, context.config) .tactic(tactic) .ends_with_newline(false); let list_str = write_list(&item_vec, &fmt)?; @@ -1828,12 +1837,12 @@ pub fn rewrite_unary_suffix( fn rewrite_unary_op( context: &RewriteContext, - op: &ast::UnOp, + op: ast::UnOp, expr: &ast::Expr, shape: Shape, ) -> Option { // For some reason, an UnOp is not spanned like BinOp! - let operator_str = match *op { + let operator_str = match op { ast::UnOp::Deref => "*", ast::UnOp::Not => "!", ast::UnOp::Neg => "-",