cargo fmt

Author: Zibi Braniecki

fluent-syntax/src/parser/parser.rs

@@ -639,17 +639,19 @@ where
             '0'...'9' => ast::Expression::NumberExpression {
                 value: get_number(ps)?,
             },
-            '-' => if let Some('0'...'9') = ps.peek() {
-                ps.reset_peek(None);
-                ast::Expression::NumberExpression {
-                    value: get_number(ps)?,
-                }
-            } else {
-                ps.reset_peek(None);
-                ast::Expression::MessageReference {
-                    id: get_entry_identifier(ps)?,
+            '-' => {
+                if let Some('0'...'9') = ps.peek() {
+                    ps.reset_peek(None);
+                    ast::Expression::NumberExpression {
+                        value: get_number(ps)?,
+                    }
+                } else {
+                    ps.reset_peek(None);
+                    ast::Expression::MessageReference {
+                        id: get_entry_identifier(ps)?,
+                    }
                 }
-            },
+            }
             '"' => ast::Expression::StringExpression {
                 value: get_string(ps)?,
             },

fluent/examples/external_arguments.rs

@@ -17,7 +17,8 @@ unread-emails =
        *[other] You have { $emailCount } unread emails
     }
 ",
-        ).unwrap();
+        )
+        .unwrap();
 
     let mut args = HashMap::new();
     args.insert("name", FluentValue::from("John"));

fluent/examples/functions.rs

@@ -10,7 +10,8 @@ fn main() {
     bundle
         .add_function("HELLO", |_args, _named_args| {
             return Some("I'm a function!".into());
-        }).unwrap();
+        })
+        .unwrap();
 
     // Test for a function that accepts unnamed positional arguments
     bundle
@@ -22,7 +23,8 @@ fn main() {
             }
 
             None
-        }).unwrap();
+        })
+        .unwrap();
 
     // Test for a function that accepts named arguments
     bundle
@@ -35,7 +37,8 @@ fn main() {
                 }
                 _ => None,
             };
-        }).unwrap();
+        })
+        .unwrap();
 
     bundle
         .add_messages("hello-world = Hey there! { HELLO() }")

fluent/examples/message_reference.rs

@@ -11,7 +11,8 @@ foo = Foo
 foobar = { foo } Bar
 bazbar = { baz } Bar
 ",
-        ).unwrap();
+        )
+        .unwrap();
 
     match bundle.format("foobar", None) {
         Some((value, _)) => println!("{}", value),

fluent/examples/selector.rs

@@ -19,7 +19,8 @@ hello-world2 = Hello { $name ->
         [moon] Moon
     }
 ",
-        ).unwrap();
+        )
+        .unwrap();
 
     match bundle.format("hello-world", None) {
         Some((value, _)) => println!("{}", value),

fluent/src/bin/parser.rs

@@ -30,7 +30,8 @@ fn main() {
         .args_from_usage(
             "-s, --silence 'disable output'
              <INPUT> 'Sets the input file to use'",
-        ).get_matches();
+        )
+        .get_matches();
 
     let input = matches.value_of("INPUT").unwrap();
 

fluent/src/bundle.rs

@@ -66,7 +66,8 @@ impl<'bundle> FluentBundle<'bundle> {
             IntlPluralRules::get_locales(PluralRuleType::CARDINAL),
             Some("en"),
             &NegotiationStrategy::Lookup,
-        )[0].to_owned();
+        )[0]
+        .to_owned();
 
         let pr = IntlPluralRules::create(&pr_locale, PluralRuleType::CARDINAL).unwrap();
         FluentBundle {
@@ -83,7 +84,9 @@ impl<'bundle> FluentBundle<'bundle> {
     pub fn add_function<F>(&mut self, id: &str, func: F) -> Result<(), FluentError>
     where
         F: 'bundle
-            + Fn(&[Option<FluentValue>], &HashMap<String, FluentValue>) -> Option<FluentValue> + Sync + Send,
+            + Fn(&[Option<FluentValue>], &HashMap<String, FluentValue>) -> Option<FluentValue>
+            + Sync
+            + Send,
     {
         match self.entries.entry(id.to_owned()) {
             HashEntry::Vacant(entry) => {

fluent/src/entry.rs

@@ -4,8 +4,12 @@ use std::collections::hash_map::HashMap;
 use super::types::FluentValue;
 use fluent_syntax::ast;
 
-type FluentFunction<'bundle> =
-    Box<'bundle + Fn(&[Option<FluentValue>], &HashMap<String, FluentValue>) -> Option<FluentValue> + Send + Sync>;
+type FluentFunction<'bundle> = Box<
+    'bundle
+        + Fn(&[Option<FluentValue>], &HashMap<String, FluentValue>) -> Option<FluentValue>
+        + Send
+        + Sync,
+>;
 
 pub enum Entry<'bundle> {
     Message(ast::Message),

fluent/src/errors.rs

@@ -3,11 +3,7 @@ use fluent_syntax::parser::errors::ParserError;
 
 #[derive(Debug, Fail, PartialEq)]
 pub enum FluentError {
-    #[fail(
-        display = "attempted to override an existing {}: {}",
-        kind,
-        id
-    )]
+    #[fail(display = "attempted to override an existing {}: {}", kind, id)]
     Overriding { kind: &'static str, id: String },
     #[fail(display = "Parser error")]
     ParserError(ParserError),

fluent/tests/bundle.rs

@@ -46,6 +46,6 @@ fn create_bundle<'a, 'b>(locales: &'b Vec<&'b str>) -> FluentBundle<'a> {
 
 #[test]
 fn bundle_locale_diff_scope() {
-    let locales = vec!("x-testing");
+    let locales = vec!["x-testing"];
     create_bundle(&locales);
 }