Run rustfmt on Travis

seanpm2001-all · Oct 16, 2017 · 90389cb · 90389cb
1 parent 9fa3c0a
commit 90389cb
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 40 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,16 +16,15 @@ addons:
       - kalakris-cmake
 
 before_script:
-  - |
-      cargo install --force cargo-travis &&
-      export PATH=$HOME/.cargo/bin:$PATH
+  - cargo install --force cargo-travis
+  - export PATH=$HOME/.cargo/bin:$PATH
+  - which rustfmt || cargo install rustfmt
 
-# the main build
 script:
-  - |
-      cargo build &&
-      cargo test &&
-      cargo doc
+  - cargo fmt -- --write-mode=diff
+  - cargo build
+  - cargo test
+  - cargo doc
 
 after_success:
 # measure code coverage and upload to coveralls.io

diff --git a/README.md b/README.md
@@ -38,13 +38,16 @@ extern crate fluent;
 
 use fluent::MessageContext;
 
-let ctx = MessageContext::new(&["en-US"]);
-ctx.add_messages("hello-world = Hello, world!");
+fn main() {
+    let mut ctx = MessageContext::new(&["en-US"]);
+    ctx.add_messages("hello-world = Hello, world!");
 
-let value = ctx.get_message("hello-world")
-               .and_then(|message| ctx.format(message, None));
+    let value = ctx.get_message("hello-world").and_then(|message| {
+        ctx.format(message, None)
+    });
 
-assert_eq!(value, Some("Hello, world!".to_string()));
+    assert_eq!(value, Some("Hello, world!".to_string()));
+}
 ```
 
 
@@ -64,7 +67,11 @@ Local Development
     cargo build
     cargo test
     cargo bench
-    cargo run --example simple
+    cargo run --example hello
+
+When submitting a PR please use  [`cargo fmt`][] (stable).
+
+[`cargo fmt`]: https://github.com/rust-lang-nursery/rustfmt
 
 
 Learn the FTL syntax

diff --git a/benches/lib.rs b/benches/lib.rs
@@ -23,7 +23,7 @@ fn read_file(path: &str) -> Result<String, io::Error> {
 fn bench_simple_parse(b: &mut Bencher) {
     let source = read_file("./benches/simple.ftl").expect("Couldn't load file");
 
-    b.iter(|| { parse(&source).unwrap(); });
+    b.iter(|| parse(&source).unwrap());
 }
 
 #[bench]
@@ -43,11 +43,9 @@ fn bench_simple_format(b: &mut Bencher) {
     let mut ctx = MessageContext::new(&["x-testing"]);
     ctx.add_messages(&source);
 
-    b.iter(|| {
-        for id in &ids {
-            if let Some(message) = ctx.get_message(id.as_str()) {
-                let _value = ctx.format(message, None);
-            }
+    b.iter(|| for id in &ids {
+        if let Some(message) = ctx.get_message(id.as_str()) {
+            let _value = ctx.format(message, None);
         }
     });
 }
@@ -56,7 +54,7 @@ fn bench_simple_format(b: &mut Bencher) {
 fn bench_menubar_parse(b: &mut Bencher) {
     let source = read_file("./benches/menubar.ftl").expect("Couldn't load file");
 
-    b.iter(|| { parse(&source).unwrap(); });
+    b.iter(|| parse(&source).unwrap());
 }
 
 #[bench]
@@ -76,20 +74,18 @@ fn bench_menubar_format(b: &mut Bencher) {
     let mut ctx = MessageContext::new(&["x-testing"]);
     ctx.add_messages(&source);
 
-    b.iter(|| {
-        for id in &ids {
-            // In real-life usage we'd have different fallback strategies for missing messages
-            // depending on the type of the widget this message was supposed to translate.  Some
-            // widgets may only expect attributes and they shouldn't be forced to display a value.
-            // Here however it doesn't matter because we know for certain that the message for `id`
-            // exists.
-            if let Some(message) = ctx.get_message(id.as_str()) {
-                let _value = ctx.format(message, None);
-
-                if let Some(ref attributes) = message.attributes {
-                    for attr in attributes {
-                        let _value = ctx.format(attr, None);
-                    }
+    b.iter(|| for id in &ids {
+        // In real-life usage we'd have different fallback strategies for missing messages
+        // depending on the type of the widget this message was supposed to translate.  Some
+        // widgets may only expect attributes and they shouldn't be forced to display a value.
+        // Here however it doesn't matter because we know for certain that the message for `id`
+        // exists.
+        if let Some(message) = ctx.get_message(id.as_str()) {
+            let _value = ctx.format(message, None);
+
+            if let Some(ref attributes) = message.attributes {
+                for attr in attributes {
+                    let _value = ctx.format(attr, None);
                 }
             }
         }

diff --git a/examples/hello.rs b/examples/hello.rs
@@ -0,0 +1,14 @@
+extern crate fluent;
+
+use fluent::MessageContext;
+
+fn main() {
+    let mut ctx = MessageContext::new(&["en-US"]);
+    ctx.add_messages("hello-world = Hello, world!");
+
+    let value = ctx.get_message("hello-world").and_then(|message| {
+        ctx.format(message, None)
+    });
+
+    assert_eq!(value, Some("Hello, world!".to_string()));
+}
diff --git a/src/intl/mod.rs b/src/intl/mod.rs
@@ -644,11 +644,8 @@ pub struct PluralRules {
 
 impl PluralRules {
     pub fn new(locales: &[&str]) -> PluralRules {
-        let supported = negotiate_languages(
-            locales,
-            LOCALES,
-            Some("en"),
-            &NegotiationStrategy::Lookup);
+        let supported =
+            negotiate_languages(locales, LOCALES, Some("en"), &NegotiationStrategy::Lookup);
 
         let locale = supported[0].to_owned();
         let f = match get_plural_rule(supported[0]) {