Apply review comments

Author: compiler-errors

Configurations.md

@@ -2780,32 +2780,31 @@ See also: [`match_block_trailing_comma`](#match_block_trailing_comma).
 
 Add trailing semicolon after break, continue and return
 
-- **Default value**: `preserve`
-- **Possible values**: `always`, `never`, `preserve`
+- **Default value**: `Preserve`
+- **Possible values**: `Preserve`, `Always`, `Never`
 - **Stable**: No (tracking issue: [#3378](https://github.com/rust-lang/rustfmt/issues/3378))
 
-#### `always` (default):
+#### `Preserve` (default):
 ```rust
 fn foo() -> usize {
     return 0;
 }
-```
 
-#### `never`:
-```rust
-fn foo() -> usize {
+fn bar() -> usize {
     return 0
 }
 ```
 
-
-#### `preserve`:
+#### `Always`:
 ```rust
 fn foo() -> usize {
     return 0;
 }
+```
 
-fn bar() -> usize {
+#### `Never`:
+```rust
+fn foo() -> usize {
     return 0
 }
 ```

src/expr.rs

@@ -64,7 +64,7 @@ pub(crate) fn format_expr(
     if contains_skip(&*expr.attrs) {
         return Some(context.snippet(expr.span()).to_owned());
     }
-    let shape = if expr_type == ExprType::Statement
+    let shape = if context.config.version() == Version::One && expr_type == ExprType::Statement
         && semicolon_for_expr_extra_hacky_double_counted_spacing(context, expr)
     {
         shape.sub_width(1)?

src/utils.rs

@@ -290,15 +290,15 @@ pub(crate) fn semicolon_for_expr(context: &RewriteContext<'_>, expr: &ast::Expr)
     }
 }
 
-/// Previously, we used to have `trailing_semicolon = always` enabled, and due to
+/// Previously, we used to have `trailing_semicolon = Always` enabled, and due to
 /// a bug between `format_stmt` and `format_expr`, we used to subtract the size of
 /// `;` *TWICE* from the shape. This means that an expr that would fit onto a line
 /// of, e.g. 99 (limit 100) after subtracting one for the semicolon would still be
 /// wrapped.
 ///
 /// This function reimplements the old heuristic of double counting the "phantom"
 /// semicolon that should have already been accounted for, to not break existing
-/// formatting with the `trailing_semicolon = preserve` behavior.
+/// formatting with the `trailing_semicolon = Preserve` behavior for Version = One.
 #[inline]
 pub(crate) fn semicolon_for_expr_extra_hacky_double_counted_spacing(
     context: &RewriteContext<'_>,

tests/source/return-expr-version-one.rs

@@ -0,0 +1,5 @@
+// rustfmt-version: One
+
+fn main() {
+    return hellooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo(arg);
+}

tests/target/configs/trailing_semicolon/always.rs

@@ -1,4 +1,4 @@
-// rustfmt-trailing_semicolon: always
+// rustfmt-trailing_semicolon: Always
 
 #![feature(loop_break_value)]
 

tests/target/configs/trailing_semicolon/never.rs

@@ -1,4 +1,4 @@
-// rustfmt-trailing_semicolon: never
+// rustfmt-trailing_semicolon: Never
 
 #![feature(loop_break_value)]
 

tests/target/configs/trailing_semicolon/preserve.rs

@@ -1,4 +1,4 @@
-// rustfmt-trailing_semicolon: never
+// rustfmt-trailing_semicolon: Never
 
 #![feature(loop_break_value)]
 

tests/target/issue-5797/retain_trailing_semicolon.rs

@@ -1,4 +1,4 @@
-// rustfmt-trailing_semicolon: never
+// rustfmt-trailing_semicolon: Never
 
 fn foo() {}
 fn main() {

tests/target/return-expr-version-one.rs

@@ -0,0 +1,7 @@
+// rustfmt-version: One
+
+fn main() {
+    return hellooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo(
+        arg,
+    );
+}

tests/target/return-expr-version-two.rs

@@ -0,0 +1,5 @@
+// rustfmt-version: Two
+
+fn main() {
+    return hellooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo(arg);
+}