Update rustfmt

stasm · stasm · commit 199ad93863f9 · 2017-12-14T09:50:28.000-06:00
diff --git a/src/context.rs b/src/context.rs
@@ -77,7 +77,6 @@ impl<'ctx> MessageContext<'ctx> {
         }
     }
 
-
     pub fn format<T: ResolveValue>(
         &self,
         resolvable: &T,
diff --git a/src/intl/mod.rs b/src/intl/mod.rs
@@ -6,179 +6,20 @@ use self::fluent_locale::negotiate_languages;
 use self::fluent_locale::NegotiationStrategy;
 
 static LOCALES: &[&'static str] = &[
-    "af",
-    "ak",
-    "am",
-    "ar",
-    "asa",
-    "az",
-    "be",
-    "bem",
-    "bez",
-    "bg",
-    "bh",
-    "bm",
-    "bn",
-    "bo",
-    "br",
-    "brx",
-    "bs",
-    "ca",
-    "cgg",
-    "chr",
-    "cs",
-    "cy",
-    "da",
-    "de",
-    "dv",
-    "dz",
-    "ee",
-    "el",
-    "en",
-    "eo",
-    "es",
-    "et",
-    "eu",
-    "fa",
-    "ff",
-    "fi",
-    "fil",
-    "fo",
-    "fr",
-    "fur",
-    "fy",
-    "ga",
-    "gd",
-    "gl",
-    "gsw",
-    "gu",
-    "guw",
-    "gv",
-    "ha",
-    "haw",
-    "he",
-    "hi",
-    "hr",
-    "hu",
-    "id",
-    "ig",
-    "ii",
-    "is",
-    "it",
-    "iu",
-    "ja",
-    "jmc",
-    "jv",
-    "ka",
-    "kab",
-    "kaj",
-    "kcg",
-    "kde",
-    "kea",
-    "kk",
-    "kl",
-    "km",
-    "kn",
-    "ko",
-    "ksb",
-    "ksh",
-    "ku",
-    "kw",
-    "lag",
-    "lb",
-    "lg",
-    "ln",
-    "lo",
-    "lt",
-    "lv",
-    "mas",
-    "mg",
-    "mk",
-    "ml",
-    "mn",
-    "mo",
-    "mr",
-    "ms",
-    "mt",
-    "my",
-    "nah",
-    "naq",
-    "nb",
-    "nd",
-    "ne",
-    "nl",
-    "nn",
-    "no",
-    "nr",
-    "nso",
-    "ny",
-    "nyn",
-    "om",
-    "or",
-    "pa",
-    "pap",
-    "pl",
-    "ps",
-    "pt",
-    "rm",
-    "ro",
-    "rof",
-    "ru",
-    "rwk",
-    "sah",
-    "saq",
-    "se",
-    "seh",
-    "ses",
-    "sg",
-    "sh",
-    "shi",
-    "sk",
-    "sl",
-    "sma",
-    "smi",
-    "smj",
-    "smn",
-    "sms",
-    "sn",
-    "so",
-    "sq",
-    "sr",
-    "ss",
-    "ssy",
-    "st",
-    "sv",
-    "sw",
-    "syr",
-    "ta",
-    "te",
-    "teo",
-    "th",
-    "ti",
-    "tig",
-    "tk",
-    "tl",
-    "tn",
-    "to",
-    "tr",
-    "ts",
-    "tzm",
-    "uk",
-    "ur",
-    "ve",
-    "vi",
-    "vun",
-    "wa",
-    "wae",
-    "wo",
-    "xh",
-    "xog",
-    "yo",
-    "zh",
-    "zu",
+    "af", "ak", "am", "ar", "asa", "az", "be", "bem", "bez", "bg", "bh", "bm", "bn", "bo", "br",
+    "brx", "bs", "ca", "cgg", "chr", "cs", "cy", "da", "de", "dv", "dz", "ee", "el", "en", "eo",
+    "es", "et", "eu", "fa", "ff", "fi", "fil", "fo", "fr", "fur", "fy", "ga", "gd", "gl", "gsw",
+    "gu", "guw", "gv", "ha", "haw", "he", "hi", "hr", "hu", "id", "ig", "ii", "is", "it", "iu",
+    "ja", "jmc", "jv", "ka", "kab", "kaj", "kcg", "kde", "kea", "kk", "kl", "km", "kn", "ko",
+    "ksb", "ksh", "ku", "kw", "lag", "lb", "lg", "ln", "lo", "lt", "lv", "mas", "mg", "mk", "ml",
+    "mn", "mo", "mr", "ms", "mt", "my", "nah", "naq", "nb", "nd", "ne", "nl", "nn", "no", "nr",
+    "nso", "ny", "nyn", "om", "or", "pa", "pap", "pl", "ps", "pt", "rm", "ro", "rof", "ru", "rwk",
+    "sah", "saq", "se", "seh", "ses", "sg", "sh", "shi", "sk", "sl", "sma", "smi", "smj", "smn",
+    "sms", "sn", "so", "sq", "sr", "ss", "ssy", "st", "sv", "sw", "syr", "ta", "te", "teo", "th",
+    "ti", "tig", "tk", "tl", "tn", "to", "tr", "ts", "tzm", "uk", "ur", "ve", "vi", "vun", "wa",
+    "wae", "wo", "xh", "xog", "yo", "zh", "zu",
 ];
 
-
 fn is_between(n: f32, start: f32, end: f32) -> bool {
     start <= n && n <= end
 }
@@ -225,16 +66,20 @@ static PLURAL_RULES: &[fn(f32) -> &'static str] = &[
     /* 3 */
     |n| if n == 1.0 { "one" } else { "other" },
     /* 4 */
-    |n| if is_between(n, 0.0, 1.0) {
-        "one"
-    } else {
-        "other"
+    |n| {
+        if is_between(n, 0.0, 1.0) {
+            "one"
+        } else {
+            "other"
+        }
     },
     /* 5 */
-    |n| if is_between(n, 0.0, 2.0) {
-        "one"
-    } else {
-        "other"
+    |n| {
+        if is_between(n, 0.0, 2.0) {
+            "one"
+        } else {
+            "other"
+        }
     },
     /* 6 */
     |n| {
@@ -357,10 +202,12 @@ static PLURAL_RULES: &[fn(f32) -> &'static str] = &[
         "other"
     },
     /* 16 */
-    |n| if n % 10.0 == 1.0 && n != 11.0 {
-        "one"
-    } else {
-        "other"
+    |n| {
+        if n % 10.0 == 1.0 && n != 11.0 {
+            "one"
+        } else {
+            "other"
+        }
     },
     /* 17 */
     |n| {
@@ -438,10 +285,12 @@ static PLURAL_RULES: &[fn(f32) -> &'static str] = &[
         "other"
     },
     /* 23 */
-    |n| if is_between(n, 0.0, 1.0) || is_between(n, 11.0, 99.0) {
-        "one"
-    } else {
-        "other"
+    |n| {
+        if is_between(n, 0.0, 1.0) || is_between(n, 11.0, 99.0) {
+            "one"
+        } else {
+            "other"
+        }
     },
     /* 24 */
     |n| {
diff --git a/src/syntax/ast.rs b/src/syntax/ast.rs
@@ -12,7 +12,9 @@ pub enum Entry {
         comment: Option<Comment>,
     },
     Comment(Comment),
-    Junk { content: String },
+    Junk {
+        content: String,
+    },
 }
 
 #[derive(Debug, PartialEq)]
@@ -42,16 +44,30 @@ pub struct Placeable {
 
 #[derive(Debug, PartialEq)]
 pub enum Expression {
-    StringExpression { value: String },
-    NumberExpression { value: Number },
-    MessageReference { id: Identifier },
-    ExternalArgument { id: Identifier },
+    StringExpression {
+        value: String,
+    },
+    NumberExpression {
+        value: Number,
+    },
+    MessageReference {
+        id: Identifier,
+    },
+    ExternalArgument {
+        id: Identifier,
+    },
     SelectExpression {
         expression: Option<Box<Expression>>,
         variants: Vec<Variant>,
     },
-    AttributeExpression { id: Identifier, name: Identifier },
-    VariantExpression { id: Identifier, key: VarKey },
+    AttributeExpression {
+        id: Identifier,
+        name: Identifier,
+    },
+    VariantExpression {
+        id: Identifier,
+        key: VarKey,
+    },
     CallExpression {
         callee: Function,
         args: Vec<Argument>,
@@ -99,7 +115,6 @@ pub struct Identifier {
     pub name: String,
 }
 
-
 #[derive(Debug, PartialEq)]
 pub struct Number {
     pub value: String,
diff --git a/src/syntax/errors/display.rs b/src/syntax/errors/display.rs
@@ -45,7 +45,6 @@ pub fn annotate_slice(info: &ErrorInfo, file_name: Option<String>, item: &Item)
     let lines_num = cmp::max(info.slice.lines().count(), 1);
     let max_ln_width = get_ln_width(info.line + lines_num);
 
-
     result += &format_title_line(item, id, &title);
     if let Some(name) = file_name {
         result += &format_pos_line(&name, info.line, info.col, max_ln_width);
@@ -129,7 +128,6 @@ fn format_slice(
         line_num += 1
     }
 
-
     result
 }
 
diff --git a/src/syntax/errors/list.rs b/src/syntax/errors/list.rs
@@ -12,14 +12,19 @@ pub struct ErrorInfo {
     pub pos: usize,
 }
 
-
 #[derive(Debug, PartialEq)]
 pub enum ErrorKind {
     Generic,
     ExpectedEntry,
-    ExpectedToken { token: char },
-    ExpectedCharRange { range: String },
-    ExpectedField { field: String },
+    ExpectedToken {
+        token: char,
+    },
+    ExpectedCharRange {
+        range: String,
+    },
+    ExpectedField {
+        field: String,
+    },
     MissingField {
         entry_id: String,
         fields: Vec<&'static str>,
@@ -54,8 +59,7 @@ pub fn get_error_desc(err: &ErrorKind) -> (&'static str, String, &'static str) {
                 "E0005",
                 format!(
                     "Expected entry `{}` to have one of the fields: {}",
-                    entry_id,
-                    list
+                    entry_id, list
                 ),
                 "",
             )
diff --git a/src/syntax/parser.rs b/src/syntax/parser.rs
@@ -146,7 +146,6 @@ where
     })
 }
 
-
 fn get_message<I>(ps: &mut ParserStream<I>, comment: Option<ast::Comment>) -> Result<ast::Entry>
 where
     I: Iterator<Item = char>,
@@ -270,7 +269,6 @@ where
     Ok(ast::Identifier { name })
 }
 
-
 fn get_variant_key<I>(ps: &mut ParserStream<I>) -> Result<ast::VarKey>
 where
     I: Iterator<Item = char>,

Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,6 @@ impl<'ctx> MessageContext<'ctx> {`
`77`	`77`	`}`
`78`	`78`	`}`
`79`	`79`
`80`		`-`
`81`	`80`	`pub fn format<T: ResolveValue>(`
`82`	`81`	`&self,`
`83`	`82`	`resolvable: &T,`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,6 @@ pub fn annotate_slice(info: &ErrorInfo, file_name: Option<String>, item: &Item)`
`45`	`45`	`let lines_num = cmp::max(info.slice.lines().count(), 1);`
`46`	`46`	`let max_ln_width = get_ln_width(info.line + lines_num);`
`47`	`47`
`48`		`-`
`49`	`48`	`result += &format_title_line(item, id, &title);`
`50`	`49`	`if let Some(name) = file_name {`
`51`	`50`	`result += &format_pos_line(&name, info.line, info.col, max_ln_width);`
`@@ -129,7 +128,6 @@ fn format_slice(`
`129`	`128`	`line_num += 1`
`130`	`129`	`}`
`131`	`130`
`132`		`-`
`133`	`131`	`result`
`134`	`132`	`}`
`135`	`133`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,6 @@ where`
`146`	`146`	`})`
`147`	`147`	`}`
`148`	`148`
`149`		`-`
`150`	`149`	`fn get_message<I>(ps: &mut ParserStream<I>, comment: Option<ast::Comment>) -> Result<ast::Entry>`
`151`	`150`	`where`
`152`	`151`	`I: Iterator<Item = char>,`
`@@ -270,7 +269,6 @@ where`
`270`	`269`	`Ok(ast::Identifier { name })`
`271`	`270`	`}`
`272`	`271`
`273`		`-`
`274`	`272`	`fn get_variant_key<I>(ps: &mut ParserStream<I>) -> Result<ast::VarKey>`
`275`	`273`	`where`
`276`	`274`	`I: Iterator<Item = char>,`