make rustfmt-normalize_comments false by default

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)";

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

tests/source/chains.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-single_line_if_else_max_width: 0
 // Test chain formatting.
 

tests/source/closure.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // Closures
 
 fn main() {

tests/source/comment.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
 
 //! Doc comment

tests/source/comment4.rs

@@ -1,5 +1,3 @@
-// rustfmt-normalize_comments: false
-
 //! Doc comment
 fn test() {
 // comment

tests/source/comment5.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
 
 //@ special comment

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 */

tests/source/expr.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
 // Test expressions
 

tests/source/extern.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 
  extern  "C" {
   fn c_func(x: *mut *mut libc::c_void);

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

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 */) {

tests/source/fn_args_layout-block.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-fn_args_layout: Block
 
 fn foo() {

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

tests/source/impls.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 impl Foo for Bar { fn foo() { "hi" } }
 
 pub impl Foo for Bar {

tests/source/imports.rs

@@ -1,3 +1,5 @@
+// rustfmt-normalize_comments: true
+
 // Imports.
 
 // Long import.

tests/source/issue-1021.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 fn main() {
     match x {
         S(true , .., true ) => (),

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,

tests/source/issue-447.rs

@@ -1,3 +1,5 @@
+// rustfmt-normalize_comments: true
+
 fn main() {
 	if /* shouldn't be dropped
 	shouldn't be dropped */

tests/source/issue-977.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // FIXME(#919)
 
 trait NameC { /* comment */ }

tests/source/macros.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 itemmacro!(this, is.now() .formatted(yay));
 
 itemmacro!(really, long.aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbb() .is.formatted());

tests/source/match.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // Match expressions.
 
 fn foo() {

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.

tests/source/pattern-condense-wildcards.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-condense_wildcard_suffices: true
 
 fn main() {

tests/source/struct_lits.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
 // Struct literal expressions.
 

tests/source/struct_lits_multiline.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
 // rustfmt-struct_lit_multiline_style: ForceMulti
 

tests/source/struct_lits_visual.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
 // rustfmt-struct_lit_style: Visual
 

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

tests/source/structs.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
 
                                                                        /// A Doc comment

tests/source/type.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 fn types() {
     let x: [ Vec   < _ > ] = [];
     let y:  * mut [ SomeType ; konst_funk() ] = expr();

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>);
 

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

tests/target/chains.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-single_line_if_else_max_width: 0
 // Test chain formatting.
 

tests/target/closure.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // Closures
 
 fn main() {

tests/target/comment.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
 
 //! Doc comment

tests/target/comment4.rs

@@ -1,5 +1,3 @@
-// rustfmt-normalize_comments: false
-
 //! Doc comment
 fn test() {
     // comment

tests/target/comment5.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
 
 //@ special comment

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

tests/target/expr.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
 // Test expressions
 

tests/target/extern.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 
 extern "C" {
     fn c_func(x: *mut *mut libc::c_void);

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

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!

tests/target/fn_args_layout-block.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-fn_args_layout: Block
 
 fn foo() {

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

tests/target/impls.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 impl Foo for Bar {
     fn foo() {
         "hi"

tests/target/imports.rs

@@ -1,3 +1,5 @@
+// rustfmt-normalize_comments: true
+
 // Imports.
 
 // Long import.

tests/target/issue-1021.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 fn main() {
     match x {
         S(true, .., true) => (),

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,

tests/target/issue-447.rs

@@ -1,3 +1,5 @@
+// rustfmt-normalize_comments: true
+
 fn main() {
     if
     // shouldn't be dropped

tests/target/issue-977.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // FIXME(#919)
 
 trait NameC {

tests/target/macros.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 itemmacro!(this, is.now().formatted(yay));
 
 itemmacro!(really,

tests/target/match.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // Match expressions.
 
 fn foo() {

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.

tests/target/pattern-condense-wildcards.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-condense_wildcard_suffices: true
 
 fn main() {

tests/target/struct_lits.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
 // Struct literal expressions.
 

tests/target/struct_lits_multiline.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
 // rustfmt-struct_lit_multiline_style: ForceMulti
 

tests/target/struct_lits_visual.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
 // rustfmt-struct_lit_style: Visual
 

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

tests/target/structs.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 // rustfmt-wrap_comments: true
 
 /// A Doc comment

tests/target/type.rs

@@ -1,3 +1,4 @@
+// rustfmt-normalize_comments: true
 fn types() {
     let x: [Vec<_>] = [];
     let y: *mut [SomeType; konst_funk()] = expr();

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>);