Remove version (#4235)

Author: topecongiro

Configurations.md

@@ -33,6 +33,7 @@ args = [
 ]
 
 [tasks.test-all]
+dependencies = ["build-bin"]
 run_task = { name = ["test", "test-ignored"] }
 
 [tasks.test-ignored]

Makefile.toml

@@ -1 +1,3 @@
-target/
+target/
+
+Cargo.lock

config_proc_macro/.gitignore

@@ -1,3 +1,2 @@
 error_on_line_overflow = true
 error_on_unformatted = true
-version = "Two"

rustfmt.toml

@@ -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

src/config.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;
             }

src/config/license.rs

@@ -1,4 +1,3 @@
-// rustfmt-version: Two
 // rustfmt-error_on_line_overflow: false
 // rustfmt-indent_style: Block
 

tests/source/configs/indent_style/block_trailing_comma_call/two.rs renamed to tests/source/configs/indent_style/block_trailing_comma_call.rs

@@ -1,5 +1,4 @@
 // rustfmt-fn_single_line: true
-// rustfmt-version: Two
 // Test single-line functions.
 
 fn foo_expr() {

tests/source/fn-single-line/version_two.rs renamed to tests/source/fn-single-line.rs

@@ -1,4 +1,3 @@
-// rustfmt-version: Two
 // rustfmt-error_on_line_overflow: false
 
 fn issue_2179() {

tests/source/issue-2179/two.rs renamed to tests/source/issue-2179.rs

@@ -1,5 +1,3 @@
-// rustfmt-version: Two
-
 fn foo() {
     match 0 {
         0 => return AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA,