Remove version (#4235)

topecongiro · web-flow · commit 5a88d5fd841c · 2020-06-06T17:23:57.000+09:00
diff --git a/Configurations.md b/Configurations.md
@@ -2610,22 +2610,6 @@ fn main() {
 }
 ```
 
-## `version`
-
-Which version of the formatting rules to use. `Version::One` is backwards-compatible
-with Rustfmt 1.0. Other versions are only backwards compatible within a major
-version number.
-
-- **Default value**: `One`
-- **Possible values**: `One`, `Two`
-- **Stable**: No (tracking issue: [#3383](https://github.com/rust-lang/rustfmt/issues/3383))
-
-### Example
-
-```toml
-version = "Two"
-```
-
 ## `where_single_line`
 
 Forces the `where` clause to be laid out on a single line.
diff --git a/Makefile.toml b/Makefile.toml
@@ -33,6 +33,7 @@ args = [
 ]
 
 [tasks.test-all]
+dependencies = ["build-bin"]
 run_task = { name = ["test", "test-ignored"] }
 
 [tasks.test-ignored]
diff --git a/config_proc_macro/.gitignore b/config_proc_macro/.gitignore
@@ -1 +1,3 @@
-target/
+target/
+
+Cargo.lock
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1,3 +1,2 @@
 error_on_line_overflow = true
 error_on_unformatted = true
-version = "Two"
diff --git a/src/config.rs b/src/config.rs
@@ -126,7 +126,6 @@ create_config! {
     blank_lines_lower_bound: usize, 0, false,
         "Minimum number of blank lines which must be put between items";
     edition: Edition, Edition::Edition2018, true, "The edition of the parser (RFC 2052)";
-    version: Version, Version::One, false, "Version of formatting rules";
     inline_attribute_width: usize, 0, false,
         "Write an item and its attribute on the same line \
         if their combined width is below a threshold";
@@ -615,7 +614,6 @@ match_block_trailing_comma = false
 blank_lines_upper_bound = 1
 blank_lines_lower_bound = 0
 edition = "2018"
-version = "One"
 inline_attribute_width = 0
 merge_derives = true
 use_try_shorthand = false
diff --git a/src/config/license.rs b/src/config/license.rs
@@ -3,8 +3,11 @@ use std::fs::File;
 use std::io;
 use std::io::Read;
 
+use itertools::Itertools;
 use regex::Regex;
 
+use self::ParsingState::*;
+
 #[derive(Debug)]
 pub(crate) enum LicenseError {
     IO(io::Error),
@@ -44,8 +47,6 @@ enum ParsingState {
     Abort(String),
 }
 
-use self::ParsingState::*;
-
 pub(crate) struct TemplateParser {
     parsed: String,
     buffer: String,
@@ -111,7 +112,7 @@ impl TemplateParser {
     /// ```
     pub(crate) fn parse(template: &str) -> Result<String, LicenseError> {
         let mut parser = Self::new();
-        for chr in template.chars() {
+        for chr in template.lines().join("\n").chars() {
             if chr == '\n' {
                 parser.linum += 1;
             }
diff --git a/tests/source/configs/indent_style/block_trailing_comma_call.rs b/tests/source/configs/indent_style/block_trailing_comma_call.rs
@@ -1,4 +1,3 @@
-// rustfmt-version: Two
 // rustfmt-error_on_line_overflow: false
 // rustfmt-indent_style: Block
 
diff --git a/tests/source/fn-single-line.rs b/tests/source/fn-single-line.rs
@@ -1,5 +1,4 @@
 // rustfmt-fn_single_line: true
-// rustfmt-version: Two
 // Test single-line functions.
 
 fn foo_expr() {
diff --git a/tests/source/issue-2179.rs b/tests/source/issue-2179.rs
@@ -1,4 +1,3 @@
-// rustfmt-version: Two
 // rustfmt-error_on_line_overflow: false
 
 fn issue_2179() {
diff --git a/tests/source/issue-3213.rs b/tests/source/issue-3213.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 fn foo() {
     match 0 {
         0 => return AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,
diff --git a/tests/source/issue-3227.rs b/tests/source/issue-3227.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 fn main() {
     thread::spawn(|| {
         while true {
diff --git a/tests/source/issue-3270/default.rs b/tests/source/issue-3270/default.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 pub fn main() {
  /*   let s = String::from(
         "
diff --git a/tests/source/issue-3272.rs b/tests/source/issue-3272.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 fn main() {
     assert!(HAYSTACK
             .par_iter()
diff --git a/tests/source/issue-3278.rs b/tests/source/issue-3278.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 pub fn parse_conditional<'a, I: 'a>()
 -> impl Parser<Input = I, Output = Expr, PartialState = ()> + 'a
 where
diff --git a/tests/source/issue-3295.rs b/tests/source/issue-3295.rs
@@ -1,4 +1,3 @@
-// rustfmt-version: Two
 pub enum TestEnum {
     a,
     b,
diff --git a/tests/source/issue-3302.rs b/tests/source/issue-3302.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 macro_rules! moo1 {
     () => {
         bar! {
diff --git a/tests/source/issue-3701.rs b/tests/source/issue-3701.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 fn build_sorted_static_get_entry_names(
     mut entries: Vec<(u8, &'static str)>,
 ) -> (impl Fn(
diff --git a/tests/source/issue-3840/hard-tabs.rs b/tests/source/issue-3840/hard-tabs.rs
@@ -1,5 +1,4 @@
 // rustfmt-hard_tabs: true
-// rustfmt-version: Two
 
 impl<Target: FromEvent<A> + FromEvent<B>, A: Widget2<Ctx = C>, B: Widget2<Ctx = C>, C: for<'a> CtxFamily<'a>> Widget2 for WidgetEventLifter<Target, A, B>
 {
diff --git a/tests/source/issue-3840/soft-tabs.rs b/tests/source/issue-3840/soft-tabs.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 impl<Target: FromEvent<A> + FromEvent<B>, A: Widget2<Ctx = C>, B: Widget2<Ctx = C>, C: for<'a> CtxFamily<'a>> Widget2 for WidgetEventLifter<Target, A, B>
 {
     type Ctx = C;
diff --git a/tests/source/issue-3904.rs b/tests/source/issue-3904.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 fn main() {
     let checkkwd = (0x2i32 | 0x1i32) as i64; /* unrecognized "\z": print both chars unless ' or " */
     
diff --git a/tests/source/long-fn-1.rs b/tests/source/long-fn-1.rs
@@ -1,4 +1,3 @@
-// rustfmt-version: Two
 // Tests that a function which is almost short enough, but not quite, gets
 // formatted correctly.
 
diff --git a/tests/source/one_line_if.rs b/tests/source/one_line_if.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 fn plain_if(x: bool) -> u8 {
     if x {
         0
diff --git a/tests/source/single-line-macro.rs b/tests/source/single-line-macro.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 // #2652
 // Preserve trailing comma inside macro, even if it looks an array.
 macro_rules! bar {
diff --git a/tests/source/trailing_comments/hard_tabs.rs b/tests/source/trailing_comments/hard_tabs.rs
@@ -1,4 +1,3 @@
-// rustfmt-version: Two
 // rustfmt-wrap_comments: true
 // rustfmt-hard_tabs: true
 
diff --git a/tests/source/trailing_comments/soft_tabs.rs b/tests/source/trailing_comments/soft_tabs.rs
@@ -1,4 +1,3 @@
-// rustfmt-version: Two
 // rustfmt-wrap_comments: true
 
 pub const IFF_MULTICAST: ::c_int = 0x0000000800; // Supports multicast
diff --git a/tests/target/configs/indent_style/block_trailing_comma_call.rs b/tests/target/configs/indent_style/block_trailing_comma_call.rs
@@ -1,4 +1,3 @@
-// rustfmt-version: Two
 // rustfmt-error_on_line_overflow: false
 // rustfmt-indent_style: Block
 
diff --git a/tests/target/fn-single-line.rs b/tests/target/fn-single-line.rs
@@ -1,5 +1,4 @@
 // rustfmt-fn_single_line: true
-// rustfmt-version: Two
 // Test single-line functions.
 
 fn foo_expr() { 1 }
diff --git a/tests/target/issue-2179.rs b/tests/target/issue-2179.rs
@@ -1,4 +1,3 @@
-// rustfmt-version: Two
 // rustfmt-error_on_line_overflow: false
 
 fn issue_2179() {
diff --git a/tests/target/issue-3132.rs b/tests/target/issue-3132.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 fn test() {
     /*
     a
diff --git a/tests/target/issue-3213.rs b/tests/target/issue-3213.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 fn foo() {
     match 0 {
         0 => {
diff --git a/tests/target/issue-3227.rs b/tests/target/issue-3227.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 fn main() {
     thread::spawn(|| {
         while true {
diff --git a/tests/target/issue-3270/default.rs b/tests/target/issue-3270/default.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 pub fn main() {
     /*   let s = String::from(
         "
diff --git a/tests/target/issue-3270/wrap.rs b/tests/target/issue-3270/wrap.rs
@@ -1,5 +1,4 @@
 // rustfmt-wrap_comments: true
-// rustfmt-version: Two
 
 // check that a line below max_width does not get over the limit when wrapping
 // it in a block comment
diff --git a/tests/target/issue-3272.rs b/tests/target/issue-3272.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 fn main() {
     assert!(
         HAYSTACK
diff --git a/tests/target/issue-3278.rs b/tests/target/issue-3278.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 pub fn parse_conditional<'a, I: 'a>()
 -> impl Parser<Input = I, Output = Expr, PartialState = ()> + 'a
 where
diff --git a/tests/target/issue-3295.rs b/tests/target/issue-3295.rs
@@ -1,4 +1,3 @@
-// rustfmt-version: Two
 pub enum TestEnum {
     a,
     b,
diff --git a/tests/target/issue-3302.rs b/tests/target/issue-3302.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 macro_rules! moo1 {
     () => {
         bar! {
diff --git a/tests/target/issue-3614.rs b/tests/target/issue-3614.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 fn main() {
     let toto = || {
         if true { 42 } else { 24 }
diff --git a/tests/target/issue-3701.rs b/tests/target/issue-3701.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 fn build_sorted_static_get_entry_names(
     mut entries: Vec<(u8, &'static str)>,
 ) -> (
diff --git a/tests/target/issue-3840/hard-tabs.rs b/tests/target/issue-3840/hard-tabs.rs
@@ -1,5 +1,4 @@
 // rustfmt-hard_tabs: true
-// rustfmt-version: Two
 
 impl<
 	Target: FromEvent<A> + FromEvent<B>,
diff --git a/tests/target/issue-3840/soft-tabs.rs b/tests/target/issue-3840/soft-tabs.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 impl<
     Target: FromEvent<A> + FromEvent<B>,
     A: Widget2<Ctx = C>,
diff --git a/tests/target/issue-3882.rs b/tests/target/issue-3882.rs
@@ -1,4 +1,3 @@
-// rustfmt-version: Two
 fn bar(_t: T, // bar
 ) {
 }
diff --git a/tests/target/issue-3904.rs b/tests/target/issue-3904.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 fn main() {
     let checkkwd = (0x2i32 | 0x1i32) as i64; /* unrecognized "\z": print both chars unless ' or " */
 }
diff --git a/tests/target/long-fn-1.rs b/tests/target/long-fn-1.rs
@@ -1,4 +1,3 @@
-// rustfmt-version: Two
 // Tests that a function which is almost short enough, but not quite, gets
 // formatted correctly.
 
diff --git a/tests/target/one_line_if.rs b/tests/target/one_line_if.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 fn plain_if(x: bool) -> u8 {
     if x { 0 } else { 1 }
 }
diff --git a/tests/target/single-line-macro.rs b/tests/target/single-line-macro.rs
@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 // #2652
 // Preserve trailing comma inside macro, even if it looks an array.
 macro_rules! bar {
diff --git a/tests/target/trailing_comments/hard_tabs.rs b/tests/target/trailing_comments/hard_tabs.rs
@@ -1,4 +1,3 @@
-// rustfmt-version: Two
 // rustfmt-wrap_comments: true
 // rustfmt-hard_tabs: true
 
diff --git a/tests/target/trailing_comments/soft_tabs.rs b/tests/target/trailing_comments/soft_tabs.rs
@@ -1,4 +1,3 @@
-// rustfmt-version: Two
 // rustfmt-wrap_comments: true
 
 pub const IFF_MULTICAST: ::c_int = 0x0000000800; // Supports multicast

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,7 @@ args = [`
`33`	`33`	`]`
`34`	`34`
`35`	`35`	`[tasks.test-all]`
	`36`	`+dependencies = ["build-bin"]`
`36`	`37`	`run_task = { name = ["test", "test-ignored"] }`
`37`	`38`
`38`	`39`	`[tasks.test-ignored]`
-Original file line number
+Diff line change
@@ @@ -1 +1,3 @@ @@
 -target/
 +target/
++
 +Cargo.lock
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,2 @@`
`1`	`1`	`error_on_line_overflow = true`
`2`	`2`	`error_on_unformatted = true`
`3`		`-version = "Two"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// rustfmt-version: Two`
`2`	`1`	`// rustfmt-error_on_line_overflow: false`
`3`	`2`	`// rustfmt-indent_style: Block`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`// rustfmt-fn_single_line: true`
`2`		`-// rustfmt-version: Two`
`3`	`2`	`// Test single-line functions.`
`4`	`3`
`5`	`4`	`fn foo_expr() {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// rustfmt-version: Two`
`2`		`-`
`3`	`1`	`fn foo() {`
`4`	`2`	`match 0 {`
`5`	`3`	`0 => return AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// rustfmt-version: Two`
`2`		`-`
`3`	`1`	`fn main() {`
`4`	`2`	`thread::spawn(\|\| {`
`5`	`3`	`while true {`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// rustfmt-version: Two`
`2`		`-`
`3`	`1`	`pub fn main() {`
`4`	`2`	`/* let s = String::from(`
`5`	`3`	`"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// rustfmt-version: Two`
`2`		`-`
`3`	`1`	`pub fn parse_conditional<'a, I: 'a>()`
`4`	`2`	`-> impl Parser<Input = I, Output = Expr, PartialState = ()> + 'a`
`5`	`3`	`where`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-// rustfmt-version: Two`
`2`	`1`	`pub enum TestEnum {`
`3`	`2`	`a,`
`4`	`3`	`b,`