use significant comments to set format_cargo_toml: true

Author: xxchan

src/test/mod.rs

@@ -696,12 +696,6 @@ fn print_mismatches<T: Fn(u32) -> String>(
 }
 
 fn read_config(filename: &Path) -> Config {
-    if filename.file_name().map_or(false, |f| f == "Cargo.toml") {
-        let mut config = Config::default();
-        config.set().format_cargo_toml(true);
-        return config;
-    }
-
     let sig_comments = read_significant_comments(filename);
     // Look for a config file. If there is a 'config' property in the significant comments, use
     // that. Otherwise, if there are no significant comments at all, look for a config file with
@@ -794,15 +788,24 @@ fn get_config(config_file: Option<&Path>) -> Config {
 
 // Reads significant comments of the form: `// rustfmt-key: value` into a hash map.
 fn read_significant_comments(file_name: &Path) -> HashMap<String, String> {
+    let is_cargo_toml = file_name.file_name().map_or(false, |f| f == "Cargo.toml");
     let file = fs::File::open(file_name)
         .unwrap_or_else(|_| panic!("couldn't read file {}", file_name.display()));
     let reader = BufReader::new(file);
-    let pattern = r"^\s*//\s*rustfmt-([^:]+):\s*(\S+)";
+    let pattern = if is_cargo_toml {
+        r"^\s*#\s*rustfmt-([^:]+):\s*(\S+)"
+    } else {
+        r"^\s*//\s*rustfmt-([^:]+):\s*(\S+)"
+    };
     let regex = regex::Regex::new(pattern).expect("failed creating pattern 1");
 
     // Matches lines containing significant comments or whitespace.
-    let line_regex = regex::Regex::new(r"(^\s*$)|(^\s*//\s*rustfmt-[^:]+:\s*\S+)")
-        .expect("failed creating pattern 2");
+    let line_regex = regex::Regex::new(if is_cargo_toml {
+        r"(^\s*$)|(^\s*#\s*rustfmt-[^:]+:\s*\S+)"
+    } else {
+        r"(^\s*$)|(^\s*//\s*rustfmt-[^:]+:\s*\S+)"
+    })
+    .expect("failed creating pattern 2");
 
     reader
         .lines()

tests/source/cargo-toml/false/Cargo.toml

@@ -0,0 +1,49 @@
+# rustfmt-format_cargo_toml: false
+
+  # comment before [[bin]], not necessarily at the beginning
+
+
+    [[bin]]    # comment  after [[bin]]
+        "aa" = 1     # comment for "aa"    
+        'bb' = 2 
+        "啊"=1
+
+         # comment before package  
+
+[package]
+    version = 1
+    description = "a\nb\nhaha"
+    name = 3
+
+   # comment 1  for arr1 line1
+   
+# comment 1 for arr1 line 2
+    arr1 = [1,
+        2,3]  
+
+# comment 2   for arr2   
+
+    arr2 = ["11111111111111111111111111111111111111111111111111111111111111111111111111111111","1111111111111111111111111111111111111111111111111111111111111111111111111111111"]
+
+   # comment before [[dependencies]], not after [package]  
+
+
+[dependencies]
+        extremely_long_crate_name_goes_here = {path = "extremely_long_path_name_goes_right_here",version = "4.5.6"}
+
+        
+        crate1 = {            path = "crate1",version = "1.2.3"                   }
+   
+# comment before the second [[bin]]
+
+[[bin]]
+        d = "git-rustfmt"
+        c = "src/git-rustfmt/main.rs"
+
+
+
+
+    #   comment at the end of the file   
+
+
+    

tests/source/cargo-toml/basic/Cargo.toml renamed to tests/source/cargo-toml/true/basic/Cargo.toml

@@ -1,4 +1,4 @@
-
+# rustfmt-format_cargo_toml: true
 
   # comment before [[bin]], not necessarily at the beginning
 

tests/source/cargo-toml/dotted-key/Cargo.toml renamed to tests/source/cargo-toml/true/dotted-key/Cargo.toml

@@ -1,3 +1,4 @@
+# rustfmt-format_cargo_toml: true
 
  [a.c]
  ac =1

tests/source/cargo-toml/virtual-manifest/Cargo.toml renamed to tests/source/cargo-toml/true/virtual-manifest/Cargo.toml

@@ -1,3 +1,4 @@
+# rustfmt-format_cargo_toml: true
 
 
    # Works correctly for Cargo.toml without [package]

tests/target/cargo-toml/false/Cargo.toml

@@ -0,0 +1,49 @@
+# rustfmt-format_cargo_toml: false
+
+  # comment before [[bin]], not necessarily at the beginning
+
+
+    [[bin]]    # comment  after [[bin]]
+        "aa" = 1     # comment for "aa"    
+        'bb' = 2 
+        "啊"=1
+
+         # comment before package  
+
+[package]
+    version = 1
+    description = "a\nb\nhaha"
+    name = 3
+
+   # comment 1  for arr1 line1
+   
+# comment 1 for arr1 line 2
+    arr1 = [1,
+        2,3]  
+
+# comment 2   for arr2   
+
+    arr2 = ["11111111111111111111111111111111111111111111111111111111111111111111111111111111","1111111111111111111111111111111111111111111111111111111111111111111111111111111"]
+
+   # comment before [[dependencies]], not after [package]  
+
+
+[dependencies]
+        extremely_long_crate_name_goes_here = {path = "extremely_long_path_name_goes_right_here",version = "4.5.6"}
+
+        
+        crate1 = {            path = "crate1",version = "1.2.3"                   }
+   
+# comment before the second [[bin]]
+
+[[bin]]
+        d = "git-rustfmt"
+        c = "src/git-rustfmt/main.rs"
+
+
+
+
+    #   comment at the end of the file   
+
+
+    

tests/target/cargo-toml/basic/Cargo.toml renamed to tests/target/cargo-toml/true/basic/Cargo.toml

@@ -15,6 +15,7 @@ a
 b
 haha"""
 
+# rustfmt-format_cargo_toml: true
 # comment before [[bin]], not necessarily at the beginning
 [[bin]] # comment  after [[bin]]
 aa = 1 # comment for "aa"

tests/target/cargo-toml/dotted-key/Cargo.toml renamed to tests/target/cargo-toml/true/dotted-key/Cargo.toml

@@ -26,6 +26,7 @@ aac = 1
 [a.a.c.d]
 aacd = 1
 
+# rustfmt-format_cargo_toml: true
 [a.c]
 ac = 1
 

tests/target/cargo-toml/virtual-manifest/Cargo.toml renamed to tests/target/cargo-toml/true/virtual-manifest/Cargo.toml

@@ -1,3 +1,4 @@
+# rustfmt-format_cargo_toml: true
 # Works correctly for Cargo.toml without [package]
 [workspace]
 exclude = ["crates/proc-macro-test/imp"]