Rustfmt

Author: sfackler

codegen/src/sqlstate.rs

@@ -71,43 +71,51 @@ fn variant_name(code: &str) -> Option<String> {
 }
 
 fn make_header(file: &mut BufWriter<File>) {
-    write!(file,
-"// Autogenerated file - DO NOT EDIT
+    write!(
+        file,
+        "// Autogenerated file - DO NOT EDIT
 use phf;
 
 "
-           ).unwrap();
+    ).unwrap();
 }
 
 fn make_enum(codes: &[Code], file: &mut BufWriter<File>) {
-    write!(file,
-r#"/// SQLSTATE error codes
+    write!(
+        file,
+        r#"/// SQLSTATE error codes
 #[derive(PartialEq, Eq, Clone, Debug)]
 #[allow(enum_variant_names)]
 pub enum SqlState {{
 "#
-           ).unwrap();
+    ).unwrap();
 
     for code in codes {
-        write!(file,
-"    /// `{}`
+        write!(
+            file,
+            "    /// `{}`
     {},\n",
-               code.code, code.variant).unwrap();
+            code.code,
+            code.variant
+        ).unwrap();
     }
 
-    write!(file,
-"    /// An unknown code
+    write!(
+        file,
+        "    /// An unknown code
     Other(String),
 }}
 
 "
-           ).unwrap();
+    ).unwrap();
 }
 
 fn make_map(codes: &[Code], file: &mut BufWriter<File>) {
-    write!(file,
-"#[cfg_attr(rustfmt, rustfmt_skip)]
-static SQLSTATE_MAP: phf::Map<&'static str, SqlState> = ").unwrap();
+    write!(
+        file,
+        "#[cfg_attr(rustfmt, rustfmt_skip)]
+static SQLSTATE_MAP: phf::Map<&'static str, SqlState> = "
+    ).unwrap();
     let mut builder = phf_codegen::Map::new();
     for code in codes {
         builder.entry(&*code.code, &format!("SqlState::{}", code.variant));
@@ -117,7 +125,9 @@ static SQLSTATE_MAP: phf::Map<&'static str, SqlState> = ").unwrap();
 }
 
 fn make_impl(codes: &[Code], file: &mut BufWriter<File>) {
-    write!(file, r#"
+    write!(
+        file,
+        r#"
 impl SqlState {{
     /// Creates a `SqlState` from its error code.
     pub fn from_code(s: &str) -> SqlState {{
@@ -130,20 +140,25 @@ impl SqlState {{
     /// Returns the error code corresponding to the `SqlState`.
     pub fn code(&self) -> &str {{
         match *self {{"#
-           ).unwrap();
+    ).unwrap();
 
     for code in codes {
-        write!(file, r#"
+        write!(
+            file,
+            r#"
             SqlState::{} => "{}","#,
-               code.variant, code.code).unwrap();
+            code.variant,
+            code.code
+        ).unwrap();
     }
 
-    write!(file, r#"
+    write!(
+        file,
+        r#"
             SqlState::Other(ref s) => s,
         }}
     }}
 }}
 "#
-           ).unwrap();
+    ).unwrap();
 }
-

codegen/src/type_gen.rs

@@ -94,9 +94,10 @@ fn parse_types(ranges: &BTreeMap<u32, u32>) -> BTreeMap<u32, Type> {
         let doc = array_re.replace(name, "$1[]");
         let mut doc = doc.to_ascii_uppercase();
 
-        let descr = lines.peek()
-                         .and_then(|line| doc_re.captures(line))
-                         .and_then(|captures| captures.at(1));
+        let descr = lines
+            .peek()
+            .and_then(|line| doc_re.captures(line))
+            .and_then(|captures| captures.at(1));
         if let Some(descr) = descr {
             doc.push_str(" - ");
             doc.push_str(descr);
@@ -119,38 +120,45 @@ fn parse_types(ranges: &BTreeMap<u32, u32>) -> BTreeMap<u32, Type> {
 }
 
 fn make_header(w: &mut BufWriter<File>) {
-    write!(w,
-"// Autogenerated file - DO NOT EDIT
+    write!(
+        w,
+        "// Autogenerated file - DO NOT EDIT
 use std::fmt;
 
 use types::{{Oid, Kind, Other}};
 
 "
-           ).unwrap();
+    ).unwrap();
 }
 
 fn make_enum(w: &mut BufWriter<File>, types: &BTreeMap<u32, Type>) {
-    write!(w,
-"/// A Postgres type.
+    write!(
+        w,
+        "/// A Postgres type.
 #[derive(PartialEq, Eq, Clone, Debug)]
 pub enum Type {{
 "
-           ).unwrap();
+    ).unwrap();
 
     for type_ in types.values() {
-        write!(w,
-"    /// {}
+        write!(
+            w,
+            "    /// {}
     {},
-"
-               , type_.doc, type_.variant).unwrap();
+",
+            type_.doc,
+            type_.variant
+        ).unwrap();
     }
 
-    write!(w,
-r"    /// An unknown type.
+    write!(
+        w,
+        r"    /// An unknown type.
     Other(Other),
 }}
 
-"         ).unwrap();
+"
+    ).unwrap();
 }
 
 fn make_display_impl(w: &mut BufWriter<File>) {
@@ -180,10 +188,13 @@ fn make_impl(w: &mut BufWriter<File>, types: &BTreeMap<u32, Type>) {
            ).unwrap();
 
     for (oid, type_) in types {
-        write!(w,
-"            {} => Some(Type::{}),
+        write!(
+            w,
+            "            {} => Some(Type::{}),
 ",
-               oid, type_.variant).unwrap();
+            oid,
+            type_.variant
+        ).unwrap();
     }
 
     write!(w,
@@ -199,10 +210,13 @@ fn make_impl(w: &mut BufWriter<File>, types: &BTreeMap<u32, Type>) {
 
 
     for (oid, type_) in types {
-        write!(w,
-"            Type::{} => {},
+        write!(
+            w,
+            "            Type::{} => {},
 ",
-               type_.variant, oid).unwrap();
+            type_.variant,
+            oid
+        ).unwrap();
     }
 
     write!(w,
@@ -224,13 +238,16 @@ fn make_impl(w: &mut BufWriter<File>, types: &BTreeMap<u32, Type>) {
             _ => "Simple".to_owned(),
         };
 
-        write!(w,
-"            Type::{} => {{
+        write!(
+            w,
+            "            Type::{} => {{
                 const V: &'static Kind = &Kind::{};
                 V
             }}
 ",
-               type_.variant, kind).unwrap();
+            type_.variant,
+            kind
+        ).unwrap();
     }
 
     write!(w,
@@ -253,17 +270,21 @@ r#"            Type::Other(ref u) => u.kind(),
           ).unwrap();
 
     for type_ in types.values() {
-        write!(w,
-r#"            Type::{} => "{}",
+        write!(
+            w,
+            r#"            Type::{} => "{}",
 "#,
-               type_.variant, type_.name).unwrap();
+            type_.variant,
+            type_.name
+        ).unwrap();
     }
 
-    write!(w,
-"            Type::Other(ref u) => u.name(),
+    write!(
+        w,
+        "            Type::Other(ref u) => u.name(),
         }}
     }}
 }}
 "
-           ).unwrap();
+    ).unwrap();
 }

postgres-protocol/src/authentication/mod.rs

@@ -30,7 +30,9 @@ mod test {
         let password = b"password";
         let salt = [0x2a, 0x3d, 0x8f, 0xe0];
 
-        assert_eq!(md5_hash(username, password, salt),
-                   "md562af4dd09bbb41884907a838a3233294");
+        assert_eq!(
+            md5_hash(username, password, salt),
+            "md562af4dd09bbb41884907a838a3233294"
+        );
     }
 }