diff --git a/tests/source/enum.rs b/tests/source/enum.rs index 654fc3a836d9..5db64b3ee3eb 100644 --- a/tests/source/enum.rs +++ b/tests/source/enum.rs @@ -1,5 +1,4 @@ // rustfmt-wrap_comments: true -// rustfmt-error_on_line_overflow: false // Enums test #[atrr] diff --git a/tests/source/file-lines-3.rs b/tests/source/file-lines-3.rs index c4f3e21b1ae2..4b825b9f58ce 100644 --- a/tests/source/file-lines-3.rs +++ b/tests/source/file-lines-3.rs @@ -1,5 +1,4 @@ -// rustfmt-file_lines: [{"file":"tests/source/file-lines-3.rs","range":[5,9]},{"file":"tests/source/file-lines-3.rs","range":[11,16]}] -// rustfmt-error_on_line_overflow: false +// rustfmt-file_lines: [{"file":"tests/source/file-lines-3.rs","range":[4,8]},{"file":"tests/source/file-lines-3.rs","range":[10,15]}] fn floaters() { let x = Foo { diff --git a/tests/source/hard-tabs.rs b/tests/source/hard-tabs.rs index b8fd09f87924..e4a0f4170075 100644 --- a/tests/source/hard-tabs.rs +++ b/tests/source/hard-tabs.rs @@ -1,7 +1,6 @@ // rustfmt-normalize_comments: true // rustfmt-wrap_comments: true // rustfmt-hard_tabs: true -// rustfmt-error_on_line_overflow: false fn main() { let x = Bar; diff --git a/tests/source/imports.rs b/tests/source/imports.rs index b56e3f1afdb8..8500764bdda2 100644 --- a/tests/source/imports.rs +++ b/tests/source/imports.rs @@ -1,5 +1,4 @@ // rustfmt-normalize_comments: true -// rustfmt-error_on_line_overflow: false // Imports. diff --git a/tests/source/issue-2179.rs b/tests/source/issue-2179.rs index ade953971ec3..60a1d947928a 100644 --- a/tests/source/issue-2179.rs +++ b/tests/source/issue-2179.rs @@ -1,5 +1,3 @@ -// rustfmt-error_on_line_overflow: false - fn issue_2179() { let (opts, rustflags, clear_env_rust_log) = { diff --git a/tests/source/issue-913.rs b/tests/source/issue-913.rs index e1c1b225fa54..25b9d42fd414 100644 --- a/tests/source/issue-913.rs +++ b/tests/source/issue-913.rs @@ -1,5 +1,3 @@ -// rustfmt-error_on_line_overflow: false - mod client { impl Client { fn test(self) -> Result<()> { diff --git a/tests/source/macro_rules.rs b/tests/source/macro_rules.rs index fdcde7f6f590..2556a55d5a30 100644 --- a/tests/source/macro_rules.rs +++ b/tests/source/macro_rules.rs @@ -1,4 +1,3 @@ -// rustfmt-error_on_line_overflow: false macro_rules! m { () => (); diff --git a/tests/source/string-lit.rs b/tests/source/string-lit.rs index e86f65f9f525..7719e76ffe75 100644 --- a/tests/source/string-lit.rs +++ b/tests/source/string-lit.rs @@ -1,5 +1,4 @@ // rustfmt-format_strings: true -// rustfmt-error_on_line_overflow: false // Long string literals fn main() -> &'static str { diff --git a/tests/source/string_punctuation.rs b/tests/source/string_punctuation.rs index 6a0afd45e5a6..efbadebb0837 100644 --- a/tests/source/string_punctuation.rs +++ b/tests/source/string_punctuation.rs @@ -1,5 +1,4 @@ // rustfmt-format_strings: true -// rustfmt-error_on_line_overflow: false fn main() { println!("ThisIsAReallyLongStringWithNoSpaces.It_should_prefer_to_break_onpunctuation:Likethisssssssssssss"); diff --git a/tests/source/struct_lits.rs b/tests/source/struct_lits.rs index 3a8016367b68..c5aaf7ef8819 100644 --- a/tests/source/struct_lits.rs +++ b/tests/source/struct_lits.rs @@ -1,6 +1,5 @@ // rustfmt-normalize_comments: true // rustfmt-wrap_comments: true -// rustfmt-error_on_line_overflow: false // Struct literal expressions. fn main() { diff --git a/tests/source/struct_lits_visual.rs b/tests/source/struct_lits_visual.rs index 2c6cc6749605..e84652e9ea9a 100644 --- a/tests/source/struct_lits_visual.rs +++ b/tests/source/struct_lits_visual.rs @@ -1,7 +1,6 @@ // rustfmt-normalize_comments: true // rustfmt-wrap_comments: true // rustfmt-indent_style: Visual -// rustfmt-error_on_line_overflow: false // Struct literal expressions. diff --git a/tests/source/struct_lits_visual_multiline.rs b/tests/source/struct_lits_visual_multiline.rs index d0b5ea6efbae..d2990f8da3dc 100644 --- a/tests/source/struct_lits_visual_multiline.rs +++ b/tests/source/struct_lits_visual_multiline.rs @@ -2,7 +2,6 @@ // rustfmt-wrap_comments: true // rustfmt-indent_style: Visual // rustfmt-struct_lit_single_line: false -// rustfmt-error_on_line_overflow: false // Struct literal expressions. diff --git a/tests/source/struct_tuple_visual.rs b/tests/source/struct_tuple_visual.rs index 369feae71d25..f95f3fe4fd39 100644 --- a/tests/source/struct_tuple_visual.rs +++ b/tests/source/struct_tuple_visual.rs @@ -1,6 +1,5 @@ // rustfmt-normalize_comments: true // rustfmt-wrap_comments: true -// rustfmt-error_on_line_overflow: false // rustfmt-indent_style: Visual fn foo() { Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo(f(), b()); diff --git a/tests/target/enum.rs b/tests/target/enum.rs index b19b69978266..6322a249c33e 100644 --- a/tests/target/enum.rs +++ b/tests/target/enum.rs @@ -1,5 +1,4 @@ // rustfmt-wrap_comments: true -// rustfmt-error_on_line_overflow: false // Enums test #[atrr] diff --git a/tests/target/file-lines-3.rs b/tests/target/file-lines-3.rs index fe465750ae11..4831e5164a80 100644 --- a/tests/target/file-lines-3.rs +++ b/tests/target/file-lines-3.rs @@ -1,5 +1,4 @@ -// rustfmt-file_lines: [{"file":"tests/source/file-lines-3.rs","range":[5,9]},{"file":"tests/source/file-lines-3.rs","range":[11,16]}] -// rustfmt-error_on_line_overflow: false +// rustfmt-file_lines: [{"file":"tests/source/file-lines-3.rs","range":[4,8]},{"file":"tests/source/file-lines-3.rs","range":[10,15]}] fn floaters() { let x = Foo { diff --git a/tests/target/hard-tabs.rs b/tests/target/hard-tabs.rs index 90be4d6b367a..aca7e09c0eac 100644 --- a/tests/target/hard-tabs.rs +++ b/tests/target/hard-tabs.rs @@ -1,7 +1,6 @@ // rustfmt-normalize_comments: true // rustfmt-wrap_comments: true // rustfmt-hard_tabs: true -// rustfmt-error_on_line_overflow: false fn main() { let x = Bar; diff --git a/tests/target/imports.rs b/tests/target/imports.rs index df4d8cdd864d..34ec34abaa60 100644 --- a/tests/target/imports.rs +++ b/tests/target/imports.rs @@ -1,5 +1,4 @@ // rustfmt-normalize_comments: true -// rustfmt-error_on_line_overflow: false // Imports. diff --git a/tests/target/issue-1802.rs b/tests/target/issue-1802.rs index a4679463ba23..ef7ee891059d 100644 --- a/tests/target/issue-1802.rs +++ b/tests/target/issue-1802.rs @@ -1,6 +1,5 @@ // rustfmt-tab_spaces: 2 // rustfmt-max_width: 30 -// rustfmt-error_on_line_overflow: false enum F { X { diff --git a/tests/target/issue-2179.rs b/tests/target/issue-2179.rs index db8f9c557b42..6dab83655cd7 100644 --- a/tests/target/issue-2179.rs +++ b/tests/target/issue-2179.rs @@ -1,5 +1,3 @@ -// rustfmt-error_on_line_overflow: false - fn issue_2179() { let (opts, rustflags, clear_env_rust_log) = { // We mustn't lock configuration for the whole build process diff --git a/tests/target/issue-2197.rs b/tests/target/issue-2197.rs index 76dbbefc3a7a..d42c08e19dbc 100644 --- a/tests/target/issue-2197.rs +++ b/tests/target/issue-2197.rs @@ -1,6 +1,5 @@ // rustfmt-max_width: 79 // rustfmt-wrap_comments: true -// rustfmt-error_on_line_overflow: false /// ```rust /// unsafe fn sum_sse2(x: i32x4) -> i32 { diff --git a/tests/target/issue-913.rs b/tests/target/issue-913.rs index 2158b70a46ff..a2b5800a7451 100644 --- a/tests/target/issue-913.rs +++ b/tests/target/issue-913.rs @@ -1,5 +1,3 @@ -// rustfmt-error_on_line_overflow: false - mod client { impl Client { fn test(self) -> Result<()> { diff --git a/tests/target/macro_rules.rs b/tests/target/macro_rules.rs index 66790091f866..d1a9340b72e3 100644 --- a/tests/target/macro_rules.rs +++ b/tests/target/macro_rules.rs @@ -1,5 +1,3 @@ -// rustfmt-error_on_line_overflow: false - macro_rules! m { () => {}; ($x:ident) => {}; diff --git a/tests/target/string-lit.rs b/tests/target/string-lit.rs index f60002ac618d..2d33061074de 100644 --- a/tests/target/string-lit.rs +++ b/tests/target/string-lit.rs @@ -1,5 +1,4 @@ // rustfmt-format_strings: true -// rustfmt-error_on_line_overflow: false // Long string literals fn main() -> &'static str { diff --git a/tests/target/string_punctuation.rs b/tests/target/string_punctuation.rs index 1cc73d14060a..5e574a400cc9 100644 --- a/tests/target/string_punctuation.rs +++ b/tests/target/string_punctuation.rs @@ -1,5 +1,4 @@ // rustfmt-format_strings: true -// rustfmt-error_on_line_overflow: false fn main() { println!( diff --git a/tests/target/struct_lits.rs b/tests/target/struct_lits.rs index 648c723d3573..fc504e5d39b0 100644 --- a/tests/target/struct_lits.rs +++ b/tests/target/struct_lits.rs @@ -1,6 +1,5 @@ // rustfmt-normalize_comments: true // rustfmt-wrap_comments: true -// rustfmt-error_on_line_overflow: false // Struct literal expressions. fn main() { diff --git a/tests/target/struct_lits_visual.rs b/tests/target/struct_lits_visual.rs index 7e93b91d8c10..00e17589db13 100644 --- a/tests/target/struct_lits_visual.rs +++ b/tests/target/struct_lits_visual.rs @@ -1,7 +1,6 @@ // rustfmt-normalize_comments: true // rustfmt-wrap_comments: true // rustfmt-indent_style: Visual -// rustfmt-error_on_line_overflow: false // Struct literal expressions. diff --git a/tests/target/struct_lits_visual_multiline.rs b/tests/target/struct_lits_visual_multiline.rs index 2809d3a26129..d9312b7af4d6 100644 --- a/tests/target/struct_lits_visual_multiline.rs +++ b/tests/target/struct_lits_visual_multiline.rs @@ -2,7 +2,6 @@ // rustfmt-wrap_comments: true // rustfmt-indent_style: Visual // rustfmt-struct_lit_single_line: false -// rustfmt-error_on_line_overflow: false // Struct literal expressions. diff --git a/tests/target/struct_tuple_visual.rs b/tests/target/struct_tuple_visual.rs index 369feae71d25..f95f3fe4fd39 100644 --- a/tests/target/struct_tuple_visual.rs +++ b/tests/target/struct_tuple_visual.rs @@ -1,6 +1,5 @@ // rustfmt-normalize_comments: true // rustfmt-wrap_comments: true -// rustfmt-error_on_line_overflow: false // rustfmt-indent_style: Visual fn foo() { Fooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooooo(f(), b());