-
Notifications
You must be signed in to change notification settings - Fork 877
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Format the last expression-statement as expression (#3631)
- Loading branch information
1 parent
84c2356
commit 1d19a08
Showing
11 changed files
with
315 additions
and
87 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| use syntax::ast; | ||
| use syntax_pos::Span; | ||
|
|
||
| use crate::comment::recover_comment_removed; | ||
| use crate::config::Version; | ||
| use crate::expr::{format_expr, ExprType}; | ||
| use crate::rewrite::{Rewrite, RewriteContext}; | ||
| use crate::shape::Shape; | ||
| use crate::source_map::LineRangeUtils; | ||
| use crate::spanned::Spanned; | ||
| use crate::utils::semicolon_for_stmt; | ||
|
|
||
| pub(crate) struct Stmt<'a> { | ||
| inner: &'a ast::Stmt, | ||
| is_last: bool, | ||
| } | ||
|
|
||
| impl<'a> Spanned for Stmt<'a> { | ||
| fn span(&self) -> Span { | ||
| self.inner.span() | ||
| } | ||
| } | ||
|
|
||
| impl<'a> Stmt<'a> { | ||
| pub(crate) fn as_ast_node(&self) -> &ast::Stmt { | ||
| self.inner | ||
| } | ||
|
|
||
| pub(crate) fn to_item(&self) -> Option<&ast::Item> { | ||
| match self.inner.node { | ||
| ast::StmtKind::Item(ref item) => Some(&**item), | ||
| _ => None, | ||
| } | ||
| } | ||
|
|
||
| pub(crate) fn from_ast_node(inner: &'a ast::Stmt, is_last: bool) -> Self { | ||
| Stmt { inner, is_last } | ||
| } | ||
|
|
||
| pub(crate) fn from_ast_nodes<I>(iter: I) -> Vec<Self> | ||
| where | ||
| I: Iterator<Item = &'a ast::Stmt>, | ||
| { | ||
| let mut result = vec![]; | ||
| let mut iter = iter.peekable(); | ||
| while iter.peek().is_some() { | ||
| result.push(Stmt { | ||
| inner: iter.next().unwrap(), | ||
| is_last: iter.peek().is_none(), | ||
| }) | ||
| } | ||
| result | ||
| } | ||
|
|
||
| fn is_last_expr(&self) -> bool { | ||
| if !self.is_last { | ||
| return false; | ||
| } | ||
|
|
||
| match self.as_ast_node().node { | ||
| ast::StmtKind::Expr(ref expr) => match expr.node { | ||
| ast::ExprKind::Ret(..) | ast::ExprKind::Continue(..) | ast::ExprKind::Break(..) => { | ||
| false | ||
| } | ||
| _ => true, | ||
| }, | ||
| _ => false, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl<'a> Rewrite for Stmt<'a> { | ||
| fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> { | ||
| let expr_type = if context.config.version() == Version::Two && self.is_last_expr() { | ||
| ExprType::SubExpression | ||
| } else { | ||
| ExprType::Statement | ||
| }; | ||
| format_stmt(context, shape, self.as_ast_node(), expr_type) | ||
| } | ||
| } | ||
|
|
||
| impl Rewrite for ast::Stmt { | ||
| fn rewrite(&self, context: &RewriteContext<'_>, shape: Shape) -> Option<String> { | ||
| format_stmt(context, shape, self, ExprType::Statement) | ||
| } | ||
| } | ||
|
|
||
| fn format_stmt( | ||
| context: &RewriteContext<'_>, | ||
| shape: Shape, | ||
| stmt: &ast::Stmt, | ||
| expr_type: ExprType, | ||
| ) -> Option<String> { | ||
| skip_out_of_file_lines_range!(context, stmt.span()); | ||
|
|
||
| let result = match stmt.node { | ||
| ast::StmtKind::Local(ref local) => local.rewrite(context, shape), | ||
| ast::StmtKind::Expr(ref ex) | ast::StmtKind::Semi(ref ex) => { | ||
| let suffix = if semicolon_for_stmt(context, stmt) { | ||
| ";" | ||
| } else { | ||
| "" | ||
| }; | ||
|
|
||
| let shape = shape.sub_width(suffix.len())?; | ||
| format_expr(ex, expr_type, context, shape).map(|s| s + suffix) | ||
| } | ||
| ast::StmtKind::Mac(..) | ast::StmtKind::Item(..) => None, | ||
| }; | ||
| result.and_then(|res| recover_comment_removed(res, stmt.span(), context)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 1 addition & 0 deletions
1
tests/source/fn-single-line.rs → tests/source/fn-single-line/version_one.rs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| // rustfmt-fn_single_line: true | ||
| // rustfmt-version: One | ||
| // Test single-line functions. | ||
|
|
||
| fn foo_expr() { | ||
|
|
||
Oops, something went wrong.