Update to the rustfmt in rust 1.31, which is now stable.

lib/codegen/meta/src/cdsl/isa.rs

@@ -153,16 +153,15 @@ impl TargetIsaBuilder {
 
                     // If the intersection is the second one, then it must be a subclass.
                     if intersect == rc2_mask {
-                        assert!(
-                            self.isa
-                                .reg_classes
-                                .get(*i1)
-                                .unwrap()
-                                .subclasses
-                                .iter()
-                                .find(|x| **x == *i2)
-                                .is_some()
-                        );
+                        assert!(self
+                            .isa
+                            .reg_classes
+                            .get(*i1)
+                            .unwrap()
+                            .subclasses
+                            .iter()
+                            .find(|x| **x == *i2)
+                            .is_some());
                     }
                 }
             }
@@ -184,7 +183,8 @@ impl TargetIsaBuilder {
             .values()
             .filter(|x| {
                 x.toprc == x.index && self.isa.reg_banks.get(x.bank).unwrap().pressure_tracking
-            }).count();
+            })
+            .count();
         assert!(num_toplevel <= 4, "Too many top-level register classes");
 
         self.isa

lib/codegen/meta/src/cdsl/settings.rs

@@ -128,7 +128,8 @@ impl SettingGroup {
                 } else {
                     false
                 }
-            }).count() as u8
+            })
+            .count() as u8
     }
 
     pub fn byte_size(&self) -> u8 {

lib/codegen/meta/src/cdsl/types.rs

@@ -190,19 +190,20 @@ impl LaneType {
 
     /// Find the unique number associated with this lane type.
     pub fn number(self) -> u8 {
-        LANE_BASE + match self {
-            LaneType::BoolType(base_types::Bool::B1) => 0,
-            LaneType::BoolType(base_types::Bool::B8) => 1,
-            LaneType::BoolType(base_types::Bool::B16) => 2,
-            LaneType::BoolType(base_types::Bool::B32) => 3,
-            LaneType::BoolType(base_types::Bool::B64) => 4,
-            LaneType::IntType(base_types::Int::I8) => 5,
-            LaneType::IntType(base_types::Int::I16) => 6,
-            LaneType::IntType(base_types::Int::I32) => 7,
-            LaneType::IntType(base_types::Int::I64) => 8,
-            LaneType::FloatType(base_types::Float::F32) => 9,
-            LaneType::FloatType(base_types::Float::F64) => 10,
-        }
+        LANE_BASE
+            + match self {
+                LaneType::BoolType(base_types::Bool::B1) => 0,
+                LaneType::BoolType(base_types::Bool::B8) => 1,
+                LaneType::BoolType(base_types::Bool::B16) => 2,
+                LaneType::BoolType(base_types::Bool::B32) => 3,
+                LaneType::BoolType(base_types::Bool::B64) => 4,
+                LaneType::IntType(base_types::Int::I8) => 5,
+                LaneType::IntType(base_types::Int::I16) => 6,
+                LaneType::IntType(base_types::Int::I32) => 7,
+                LaneType::IntType(base_types::Int::I64) => 8,
+                LaneType::FloatType(base_types::Float::F32) => 9,
+                LaneType::FloatType(base_types::Float::F64) => 10,
+            }
     }
 }
 

lib/codegen/meta/src/srcgen.rs

@@ -114,7 +114,8 @@ impl Formatter {
                 } else {
                     format!("/// {}", l)
                 }
-            }).for_each(|s| self.line(s.as_str()));
+            })
+            .for_each(|s| self.line(s.as_str()));
     }
 
     /// Add a match expression.
@@ -131,7 +132,8 @@ impl Formatter {
                         } else {
                             name.clone()
                         }
-                    }).collect();
+                    })
+                    .collect();
                 let lhs = conditions.join(" | ");
                 fmt.line(&format!("{} => {{", lhs));
                 fmt.indent(|fmt| {