From 846d7ad387f6866571da305c84d31bc5c0bf4818 Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Mon, 16 Jan 2017 14:50:27 +1300
Subject: [PATCH] make rustfmt-normalize_comments false by default
---
src/config.rs | 2 +-
tests/source/chains-visual.rs | 1 +
tests/source/chains.rs | 1 +
tests/source/closure.rs | 1 +
tests/source/comment.rs | 1 +
tests/source/comment4.rs | 2 --
tests/source/comment5.rs | 1 +
tests/source/comment_crlf_newline.rs | 1 +
tests/source/expr.rs | 1 +
tests/source/extern.rs | 1 +
tests/source/fn-custom-7.rs | 1 +
tests/source/fn-simple.rs | 1 +
tests/source/fn_args_layout-block.rs | 1 +
tests/source/hard-tabs.rs | 1 +
tests/source/impls.rs | 1 +
tests/source/imports.rs | 2 ++
tests/source/issue-1021.rs | 1 +
tests/source/issue-1216.rs | 1 +
tests/source/issue-447.rs | 2 ++
tests/source/issue-977.rs | 1 +
tests/source/macros.rs | 1 +
tests/source/match.rs | 1 +
tests/source/multiple.rs | 1 +
tests/source/pattern-condense-wildcards.rs | 1 +
tests/source/struct_lits.rs | 1 +
tests/source/struct_lits_multiline.rs | 1 +
tests/source/struct_lits_visual.rs | 1 +
tests/source/struct_lits_visual_multiline.rs | 1 +
tests/source/structs.rs | 1 +
tests/source/type.rs | 1 +
tests/source/type_alias.rs | 1 +
tests/target/chains-visual.rs | 1 +
tests/target/chains.rs | 1 +
tests/target/closure.rs | 1 +
tests/target/comment.rs | 1 +
tests/target/comment4.rs | 2 --
tests/target/comment5.rs | 1 +
tests/target/comment_crlf_newline.rs | 1 +
tests/target/expr.rs | 1 +
tests/target/extern.rs | 1 +
tests/target/fn-custom-7.rs | 1 +
tests/target/fn-simple.rs | 1 +
tests/target/fn_args_layout-block.rs | 1 +
tests/target/hard-tabs.rs | 1 +
tests/target/impls.rs | 1 +
tests/target/imports.rs | 2 ++
tests/target/issue-1021.rs | 1 +
tests/target/issue-1216.rs | 1 +
tests/target/issue-447.rs | 2 ++
tests/target/issue-977.rs | 1 +
tests/target/macros.rs | 1 +
tests/target/match.rs | 1 +
tests/target/multiple.rs | 1 +
tests/target/pattern-condense-wildcards.rs | 1 +
tests/target/struct_lits.rs | 1 +
tests/target/struct_lits_multiline.rs | 1 +
tests/target/struct_lits_visual.rs | 1 +
tests/target/struct_lits_visual_multiline.rs | 1 +
tests/target/structs.rs | 1 +
tests/target/type.rs | 1 +
tests/target/type_alias.rs | 1 +
61 files changed, 63 insertions(+), 5 deletions(-)
diff --git a/src/config.rs b/src/config.rs
index 0095e714f69..b974de703bb 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -393,7 +393,7 @@ create_config! {
take_source_hints: bool, true, "Retain some formatting characteristics from the source code";
hard_tabs: bool, false, "Use tab characters for indentation, spaces for alignment";
wrap_comments: bool, false, "Break comments to fit on the line";
- normalize_comments: bool, true, "Convert /* */ comments to // comments where possible";
+ normalize_comments: bool, false, "Convert /* */ comments to // comments where possible";
wrap_match_arms: bool, true, "Wrap multiline match arms in blocks";
match_block_trailing_comma: bool, false,
"Put a trailing comma after a block based match arm (non-block arms are not affected)";
diff --git a/tests/source/chains-visual.rs b/tests/source/chains-visual.rs
index bd365ce9a4c..cc9899fcc60 100644
--- a/tests/source/chains-visual.rs
+++ b/tests/source/chains-visual.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-single_line_if_else_max_width: 0
// rustfmt-chain_indent: Visual
// rustfmt-chain_base_indent: Visual
diff --git a/tests/source/chains.rs b/tests/source/chains.rs
index 39d3c65d9b7..de5c3e6e823 100644
--- a/tests/source/chains.rs
+++ b/tests/source/chains.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-single_line_if_else_max_width: 0
// Test chain formatting.
diff --git a/tests/source/closure.rs b/tests/source/closure.rs
index 0a0dd717586..b95f961405a 100644
--- a/tests/source/closure.rs
+++ b/tests/source/closure.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// Closures
fn main() {
diff --git a/tests/source/comment.rs b/tests/source/comment.rs
index e461a2041ff..0f76f220582 100644
--- a/tests/source/comment.rs
+++ b/tests/source/comment.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
//! Doc comment
diff --git a/tests/source/comment4.rs b/tests/source/comment4.rs
index 0ed18ca8da1..38442a79360 100644
--- a/tests/source/comment4.rs
+++ b/tests/source/comment4.rs
@@ -1,5 +1,3 @@
-// rustfmt-normalize_comments: false
-
//! Doc comment
fn test() {
// comment
diff --git a/tests/source/comment5.rs b/tests/source/comment5.rs
index 87a26f353a7..02dbac8e4f4 100644
--- a/tests/source/comment5.rs
+++ b/tests/source/comment5.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
//@ special comment
diff --git a/tests/source/comment_crlf_newline.rs b/tests/source/comment_crlf_newline.rs
index 189a7053179..7a65f762f6c 100644
--- a/tests/source/comment_crlf_newline.rs
+++ b/tests/source/comment_crlf_newline.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
/* Block comments followed by CRLF newlines should not an extra newline at the end */
/* Something else */
diff --git a/tests/source/expr.rs b/tests/source/expr.rs
index f9a0251910c..c0d1e3477e0 100644
--- a/tests/source/expr.rs
+++ b/tests/source/expr.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
// Test expressions
diff --git a/tests/source/extern.rs b/tests/source/extern.rs
index 347612dd8f1..1dd1df2b74e 100644
--- a/tests/source/extern.rs
+++ b/tests/source/extern.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
extern "C" {
fn c_func(x: *mut *mut libc::c_void);
diff --git a/tests/source/fn-custom-7.rs b/tests/source/fn-custom-7.rs
index 27c97867d26..1cbcd211808 100644
--- a/tests/source/fn-custom-7.rs
+++ b/tests/source/fn-custom-7.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-fn_args_layout: BlockAlways
// rustfmt-fn_args_density: Vertical
// rustfmt-fn_arg_indent: Tabbed
diff --git a/tests/source/fn-simple.rs b/tests/source/fn-simple.rs
index 044d494bd37..1764266718e 100644
--- a/tests/source/fn-simple.rs
+++ b/tests/source/fn-simple.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
fn simple(/*pre-comment on a function!?*/ i: i32/*yes, it's possible! */
,response: NoWay /* hose */) {
diff --git a/tests/source/fn_args_layout-block.rs b/tests/source/fn_args_layout-block.rs
index b87158a4d7f..be22369ab8c 100644
--- a/tests/source/fn_args_layout-block.rs
+++ b/tests/source/fn_args_layout-block.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-fn_args_layout: Block
fn foo() {
diff --git a/tests/source/hard-tabs.rs b/tests/source/hard-tabs.rs
index c19d5d4c01f..8374b1e70ed 100644
--- a/tests/source/hard-tabs.rs
+++ b/tests/source/hard-tabs.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-single_line_if_else_max_width: 0
// rustfmt-wrap_comments: true
// rustfmt-hard_tabs: true
diff --git a/tests/source/impls.rs b/tests/source/impls.rs
index 978ac8cc313..aac87a1227f 100644
--- a/tests/source/impls.rs
+++ b/tests/source/impls.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
impl Foo for Bar { fn foo() { "hi" } }
pub impl Foo for Bar {
diff --git a/tests/source/imports.rs b/tests/source/imports.rs
index 4296a152f4e..adeeba02338 100644
--- a/tests/source/imports.rs
+++ b/tests/source/imports.rs
@@ -1,3 +1,5 @@
+// rustfmt-normalize_comments: true
+
// Imports.
// Long import.
diff --git a/tests/source/issue-1021.rs b/tests/source/issue-1021.rs
index 2c1b4716f57..380e24cc0b0 100644
--- a/tests/source/issue-1021.rs
+++ b/tests/source/issue-1021.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
fn main() {
match x {
S(true , .., true ) => (),
diff --git a/tests/source/issue-1216.rs b/tests/source/issue-1216.rs
index da5f3471f72..d727c158ab8 100644
--- a/tests/source/issue-1216.rs
+++ b/tests/source/issue-1216.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
enum E {
A, //* I am not a block comment (caused panic)
B,
diff --git a/tests/source/issue-447.rs b/tests/source/issue-447.rs
index cc713af3f18..7c542cb58c2 100644
--- a/tests/source/issue-447.rs
+++ b/tests/source/issue-447.rs
@@ -1,3 +1,5 @@
+// rustfmt-normalize_comments: true
+
fn main() {
if /* shouldn't be dropped
shouldn't be dropped */
diff --git a/tests/source/issue-977.rs b/tests/source/issue-977.rs
index dc2663d581b..b028b36a055 100644
--- a/tests/source/issue-977.rs
+++ b/tests/source/issue-977.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// FIXME(#919)
trait NameC { /* comment */ }
diff --git a/tests/source/macros.rs b/tests/source/macros.rs
index 5b6eb53daec..1c4fd138820 100644
--- a/tests/source/macros.rs
+++ b/tests/source/macros.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
itemmacro!(this, is.now() .formatted(yay));
itemmacro!(really, long.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbb() .is.formatted());
diff --git a/tests/source/match.rs b/tests/source/match.rs
index a9fb5404047..2fb584c322c 100644
--- a/tests/source/match.rs
+++ b/tests/source/match.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// Match expressions.
fn foo() {
diff --git a/tests/source/multiple.rs b/tests/source/multiple.rs
index 863d20f50ea..fe8cc1787f2 100644
--- a/tests/source/multiple.rs
+++ b/tests/source/multiple.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
// Test of lots of random stuff.
// FIXME split this into multiple, self-contained tests.
diff --git a/tests/source/pattern-condense-wildcards.rs b/tests/source/pattern-condense-wildcards.rs
index bac712528dc..5f84aea0a6b 100644
--- a/tests/source/pattern-condense-wildcards.rs
+++ b/tests/source/pattern-condense-wildcards.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-condense_wildcard_suffices: true
fn main() {
diff --git a/tests/source/struct_lits.rs b/tests/source/struct_lits.rs
index 1341983ed0f..8d762eed980 100644
--- a/tests/source/struct_lits.rs
+++ b/tests/source/struct_lits.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
// Struct literal expressions.
diff --git a/tests/source/struct_lits_multiline.rs b/tests/source/struct_lits_multiline.rs
index dc0470b1447..120cc93471a 100644
--- a/tests/source/struct_lits_multiline.rs
+++ b/tests/source/struct_lits_multiline.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
// rustfmt-struct_lit_multiline_style: ForceMulti
diff --git a/tests/source/struct_lits_visual.rs b/tests/source/struct_lits_visual.rs
index c7534eff7cb..1ea26522ea7 100644
--- a/tests/source/struct_lits_visual.rs
+++ b/tests/source/struct_lits_visual.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
// rustfmt-struct_lit_style: Visual
diff --git a/tests/source/struct_lits_visual_multiline.rs b/tests/source/struct_lits_visual_multiline.rs
index 58be4da68ad..57714ed989b 100644
--- a/tests/source/struct_lits_visual_multiline.rs
+++ b/tests/source/struct_lits_visual_multiline.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
// rustfmt-struct_lit_style: Visual
// rustfmt-struct_lit_multiline_style: ForceMulti
diff --git a/tests/source/structs.rs b/tests/source/structs.rs
index 5a13d59f572..cdcccda39a5 100644
--- a/tests/source/structs.rs
+++ b/tests/source/structs.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
/// A Doc comment
diff --git a/tests/source/type.rs b/tests/source/type.rs
index 75c156455f9..0a46ffb2ee4 100644
--- a/tests/source/type.rs
+++ b/tests/source/type.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
fn types() {
let x: [ Vec < _ > ] = [];
let y: * mut [ SomeType ; konst_funk() ] = expr();
diff --git a/tests/source/type_alias.rs b/tests/source/type_alias.rs
index 93e155534ec..7c0b500c753 100644
--- a/tests/source/type_alias.rs
+++ b/tests/source/type_alias.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
type PrivateTest<'a, I> = (Box<Parser<Input=I, Output=char> + 'a>, Box<Parser<Input=I, Output=char> + 'a>);
diff --git a/tests/target/chains-visual.rs b/tests/target/chains-visual.rs
index 472532676c5..3ece67291da 100644
--- a/tests/target/chains-visual.rs
+++ b/tests/target/chains-visual.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-single_line_if_else_max_width: 0
// rustfmt-chain_indent: Visual
// rustfmt-chain_base_indent: Visual
diff --git a/tests/target/chains.rs b/tests/target/chains.rs
index 726dbac155f..488d64afacd 100644
--- a/tests/target/chains.rs
+++ b/tests/target/chains.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-single_line_if_else_max_width: 0
// Test chain formatting.
diff --git a/tests/target/closure.rs b/tests/target/closure.rs
index 101f3ea961c..bc4d03981d5 100644
--- a/tests/target/closure.rs
+++ b/tests/target/closure.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// Closures
fn main() {
diff --git a/tests/target/comment.rs b/tests/target/comment.rs
index 9577ff22b60..71ef6acf99a 100644
--- a/tests/target/comment.rs
+++ b/tests/target/comment.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
//! Doc comment
diff --git a/tests/target/comment4.rs b/tests/target/comment4.rs
index 910bade6c88..ff71124f464 100644
--- a/tests/target/comment4.rs
+++ b/tests/target/comment4.rs
@@ -1,5 +1,3 @@
-// rustfmt-normalize_comments: false
-
//! Doc comment
fn test() {
// comment
diff --git a/tests/target/comment5.rs b/tests/target/comment5.rs
index 7006b35efed..2ca371060d5 100644
--- a/tests/target/comment5.rs
+++ b/tests/target/comment5.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
//@ special comment
diff --git a/tests/target/comment_crlf_newline.rs b/tests/target/comment_crlf_newline.rs
index 3b19b01a7eb..aab9e94d9e6 100644
--- a/tests/target/comment_crlf_newline.rs
+++ b/tests/target/comment_crlf_newline.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// Block comments followed by CRLF newlines should not an extra newline at the end
// Something else
diff --git a/tests/target/expr.rs b/tests/target/expr.rs
index ec9c6f10f5f..38007e31f1e 100644
--- a/tests/target/expr.rs
+++ b/tests/target/expr.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
// Test expressions
diff --git a/tests/target/extern.rs b/tests/target/extern.rs
index e25e8b01cd4..06d9d771e79 100644
--- a/tests/target/extern.rs
+++ b/tests/target/extern.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
extern "C" {
fn c_func(x: *mut *mut libc::c_void);
diff --git a/tests/target/fn-custom-7.rs b/tests/target/fn-custom-7.rs
index 82260d8c863..1ae9f4ea896 100644
--- a/tests/target/fn-custom-7.rs
+++ b/tests/target/fn-custom-7.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-fn_args_layout: BlockAlways
// rustfmt-fn_args_density: Vertical
// rustfmt-fn_arg_indent: Tabbed
diff --git a/tests/target/fn-simple.rs b/tests/target/fn-simple.rs
index 17a3ac0fe15..4bcbbd6613f 100644
--- a/tests/target/fn-simple.rs
+++ b/tests/target/fn-simple.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
fn simple(// pre-comment on a function!?
i: i32, // yes, it's possible!
diff --git a/tests/target/fn_args_layout-block.rs b/tests/target/fn_args_layout-block.rs
index cf380c649c8..728dc0b1598 100644
--- a/tests/target/fn_args_layout-block.rs
+++ b/tests/target/fn_args_layout-block.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-fn_args_layout: Block
fn foo() {
diff --git a/tests/target/hard-tabs.rs b/tests/target/hard-tabs.rs
index d3adae03481..c48f43581f9 100644
--- a/tests/target/hard-tabs.rs
+++ b/tests/target/hard-tabs.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-single_line_if_else_max_width: 0
// rustfmt-wrap_comments: true
// rustfmt-hard_tabs: true
diff --git a/tests/target/impls.rs b/tests/target/impls.rs
index dee683d18b1..6f7990926fd 100644
--- a/tests/target/impls.rs
+++ b/tests/target/impls.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
impl Foo for Bar {
fn foo() {
"hi"
diff --git a/tests/target/imports.rs b/tests/target/imports.rs
index 0be8f2c35e0..4e7627dd1b9 100644
--- a/tests/target/imports.rs
+++ b/tests/target/imports.rs
@@ -1,3 +1,5 @@
+// rustfmt-normalize_comments: true
+
// Imports.
// Long import.
diff --git a/tests/target/issue-1021.rs b/tests/target/issue-1021.rs
index e4379855642..cc85aa73cae 100644
--- a/tests/target/issue-1021.rs
+++ b/tests/target/issue-1021.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
fn main() {
match x {
S(true, .., true) => (),
diff --git a/tests/target/issue-1216.rs b/tests/target/issue-1216.rs
index da5f3471f72..d727c158ab8 100644
--- a/tests/target/issue-1216.rs
+++ b/tests/target/issue-1216.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
enum E {
A, //* I am not a block comment (caused panic)
B,
diff --git a/tests/target/issue-447.rs b/tests/target/issue-447.rs
index 7e69c708eb7..7c1d370d0e8 100644
--- a/tests/target/issue-447.rs
+++ b/tests/target/issue-447.rs
@@ -1,3 +1,5 @@
+// rustfmt-normalize_comments: true
+
fn main() {
if
// shouldn't be dropped
diff --git a/tests/target/issue-977.rs b/tests/target/issue-977.rs
index ad7c2bd4e5c..9420054449d 100644
--- a/tests/target/issue-977.rs
+++ b/tests/target/issue-977.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// FIXME(#919)
trait NameC {
diff --git a/tests/target/macros.rs b/tests/target/macros.rs
index e5a0fc9731c..66bf4d33a98 100644
--- a/tests/target/macros.rs
+++ b/tests/target/macros.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
itemmacro!(this, is.now().formatted(yay));
itemmacro!(really,
diff --git a/tests/target/match.rs b/tests/target/match.rs
index bc5556283c3..e6c680f3cb7 100644
--- a/tests/target/match.rs
+++ b/tests/target/match.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// Match expressions.
fn foo() {
diff --git a/tests/target/multiple.rs b/tests/target/multiple.rs
index e29bb259ece..d2a736330f7 100644
--- a/tests/target/multiple.rs
+++ b/tests/target/multiple.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
// Test of lots of random stuff.
// FIXME split this into multiple, self-contained tests.
diff --git a/tests/target/pattern-condense-wildcards.rs b/tests/target/pattern-condense-wildcards.rs
index 96519cf3d44..ebf89c582ff 100644
--- a/tests/target/pattern-condense-wildcards.rs
+++ b/tests/target/pattern-condense-wildcards.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-condense_wildcard_suffices: true
fn main() {
diff --git a/tests/target/struct_lits.rs b/tests/target/struct_lits.rs
index c8b475df24f..5ab8de3f235 100644
--- a/tests/target/struct_lits.rs
+++ b/tests/target/struct_lits.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
// Struct literal expressions.
diff --git a/tests/target/struct_lits_multiline.rs b/tests/target/struct_lits_multiline.rs
index 91ead9e764a..0eb7b8b759f 100644
--- a/tests/target/struct_lits_multiline.rs
+++ b/tests/target/struct_lits_multiline.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
// rustfmt-struct_lit_multiline_style: ForceMulti
diff --git a/tests/target/struct_lits_visual.rs b/tests/target/struct_lits_visual.rs
index 3a3aa35bb16..a9c682af15b 100644
--- a/tests/target/struct_lits_visual.rs
+++ b/tests/target/struct_lits_visual.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
// rustfmt-struct_lit_style: Visual
diff --git a/tests/target/struct_lits_visual_multiline.rs b/tests/target/struct_lits_visual_multiline.rs
index f233b24c213..30d8815514b 100644
--- a/tests/target/struct_lits_visual_multiline.rs
+++ b/tests/target/struct_lits_visual_multiline.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
// rustfmt-struct_lit_style: Visual
// rustfmt-struct_lit_multiline_style: ForceMulti
diff --git a/tests/target/structs.rs b/tests/target/structs.rs
index 3d3b20a9ad6..40b410c072b 100644
--- a/tests/target/structs.rs
+++ b/tests/target/structs.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
// rustfmt-wrap_comments: true
/// A Doc comment
diff --git a/tests/target/type.rs b/tests/target/type.rs
index f9afb8aed02..c002d3c2c67 100644
--- a/tests/target/type.rs
+++ b/tests/target/type.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
fn types() {
let x: [Vec<_>] = [];
let y: *mut [SomeType; konst_funk()] = expr();
diff --git a/tests/target/type_alias.rs b/tests/target/type_alias.rs
index 16c77b273c1..42600aa3ae5 100644
--- a/tests/target/type_alias.rs
+++ b/tests/target/type_alias.rs
@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
type PrivateTest<'a, I> = (Box<Parser<Input = I, Output = char> + 'a>,
Box<Parser<Input = I, Output = char> + 'a>);