Skip to content

Commit

Permalink
don't apply formatting to builtin type ascription syntax
Browse files Browse the repository at this point in the history
The syntax changed from `expr: ty` -> `builtin # type_ascribe(expr, ty)`
For now, rustfmt will just emit the contents of the span.
  • Loading branch information
ytmimi committed Jun 7, 2024
1 parent fba50ab commit e5f5cad
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,13 @@
[bytecount#92]: https://github.com/llogiq/bytecount/pull/92
[bytecount#93]: https://github.com/llogiq/bytecount/pull/93

- Output correct syntax for type ascription builtin [#6159](https://github.com/rust-lang/rustfmt/issues/6159)
```rust
fn main() {
builtin # type_ascribe(10, usize)
}
```

## [1.7.0] 2023-10-22

### Fixed
Expand Down
9 changes: 1 addition & 8 deletions src/expr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -263,14 +263,6 @@ pub(crate) fn format_expr(
shape,
SeparatorPlace::Front,
),
ast::ExprKind::Type(ref expr, ref ty) => rewrite_pair(
&**expr,
&**ty,
PairParts::infix(": "),
context,
shape,
SeparatorPlace::Back,
),
ast::ExprKind::Index(ref expr, ref index, _) => {
rewrite_index(&**expr, &**index, context, shape)
}
Expand Down Expand Up @@ -412,6 +404,7 @@ pub(crate) fn format_expr(
}
ast::ExprKind::Underscore => Some("_".to_owned()),
ast::ExprKind::FormatArgs(..)
| ast::ExprKind::Type(..)
| ast::ExprKind::IncludedBytes(..)
| ast::ExprKind::OffsetOf(..) => {
// These don't normally occur in the AST because macros aren't expanded. However,
Expand Down
3 changes: 3 additions & 0 deletions tests/target/issue_6159.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
fn main() {
builtin # type_ascribe(10, usize)
}

0 comments on commit e5f5cad

Please sign in to comment.