Merge pull request #116 from thibaultdelor/StableRustfmt

Format using rustfmt 1.0

saphyr/.travis.yml

@@ -7,7 +7,7 @@ matrix:
     - rust: nightly
     - rust: 1.17.0
       script: cargo build
-    - rust: 1.22.1
+    - rust: 1.24.1
     - rust: nightly
       env: CLIPPY
       script: |

saphyr/appveyor.yml

@@ -1,6 +1,6 @@
 install:
-  - ps: Start-FileDownload 'https://static.rust-lang.org/dist/rust-1.22.1-i686-pc-windows-gnu.exe'
+  - ps: Start-FileDownload 'https://static.rust-lang.org/dist/rust-1.24.1-i686-pc-windows-gnu.exe'
-  - rust-1.22.1-i686-pc-windows-gnu.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
+  - rust-1.24.1-i686-pc-windows-gnu.exe /VERYSILENT /NORESTART /DIR="C:\Program Files (x86)\Rust"
   - SET PATH=%PATH%;C:\Program Files (x86)\Rust\bin
   - SET PATH=%PATH%;C:\MinGW\bin
   - rustc -V

saphyr/src/emitter.rs

@@ -334,7 +334,7 @@ fn need_quotes(string: &str) -> bool {
             // http://yaml.org/type/null.html
             "null", "Null", "NULL", "~",
         ]
-            .contains(&string)
+        .contains(&string)
         || string.starts_with('.')
         || string.parse::<i64>().is_ok()
         || string.parse::<f64>().is_ok()

saphyr/src/scanner.rs

@@ -483,10 +483,12 @@ impl<T: Iterator<Item = char>> Scanner<T> {
                         self.allow_simple_key();
                     }
                 }
-                '#' => while !is_breakz(self.ch()) {
+                '#' => {
-                    self.skip();
+                    while !is_breakz(self.ch()) {
-                    self.lookahead(1);
+                        self.skip();
-                },
+                        self.lookahead(1);
+                    }
+                }
                 _ => break,
             }
         }
@@ -929,11 +931,13 @@ impl<T: Iterator<Item = char>> Scanner<T> {
             self.lookahead(1);
         }
 
-        if string.is_empty() || match self.ch() {
+        if string.is_empty()
-            c if is_blankz(c) => false,
+            || match self.ch() {
-            '?' | ':' | ',' | ']' | '}' | '%' | '@' | '`' => false,
+                c if is_blankz(c) => false,
-            _ => true,
+                '?' | ':' | ',' | ']' | '}' | '%' | '@' | '`' => false,
-        } {
+                _ => true,
+            }
+        {
             return Err(ScanError::new(start_mark, "while scanning an anchor or alias, did not find expected alphabetic or numeric character"));
         }
 

saphyr/src/yaml.rs

@@ -409,7 +409,8 @@ a4:
 a5: 'single_quoted'
 a6: \"double_quoted\"
 a7: 你好
-".to_owned();
+"
+        .to_owned();
         let out = YamlLoader::load_from_str(&s).unwrap();
         let doc = &out[0];
         assert_eq!(doc["a7"].as_str().unwrap(), "你好");
@@ -652,7 +653,8 @@ hash:
     with:
         indentations
 "#,
-        ).unwrap()
+        )
+        .unwrap()
         .into_iter()
         .next()
         .unwrap();
@@ -663,7 +665,8 @@ hash:
   with:
     indentations
 "#,
-        ).unwrap()
+        )
+        .unwrap()
         .into_iter()
         .next()
         .unwrap();
@@ -674,7 +677,8 @@ hash:
  with:
   indentations
 "#,
-        ).unwrap()
+        )
+        .unwrap()
         .into_iter()
         .next()
         .unwrap();
@@ -685,7 +689,8 @@ hash:
      with:
                indentations
 "#,
-        ).unwrap()
+        )
+        .unwrap()
         .into_iter()
         .next()
         .unwrap();