chore: rustfmt

lccc-project · Jan 22, 2024 · 57da2db · 57da2db
1 parent fdd8846
commit 57da2db
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 13 deletions.
diff --git a/rust/src/irgen.rs b/rust/src/irgen.rs
@@ -4,9 +4,13 @@ pub mod name_visitor;
 pub mod xir_visitor;
 
 use crate::{
+    helpers::nzu16,
     interning::Symbol,
     irgen::xir_visitor::{XirModTypeGatherer, XirModVisitor},
-    sema::{DefId, Definitions, ty::{IntType, IntWidth}}, helpers::nzu16,
+    sema::{
+        ty::{IntType, IntWidth},
+        DefId, Definitions,
+    },
 };
 
 use xlang::ir;
@@ -63,16 +67,46 @@ impl IntMangler {
 
     fn mangle(&self, ty: &IntType) -> char {
         char::from(match *ty {
-            IntType { signed: true, width: IntWidth::Bits(x) } if x == nzu16!(8) => self.i8,
-            IntType { signed: true, width: IntWidth::Bits(x) } if x == nzu16!(16) => self.i16,
-            IntType { signed: true, width: IntWidth::Bits(x) } if x == nzu16!(32) => self.i32,
-            IntType { signed: true, width: IntWidth::Bits(x) } if x == nzu16!(64) => self.i64,
-            IntType { signed: true, width: IntWidth::Bits(x) } if x == nzu16!(128) => self.i128,
-            IntType { signed: false, width: IntWidth::Bits(x) } if x == nzu16!(8) => self.u8,
-            IntType { signed: false, width: IntWidth::Bits(x) } if x == nzu16!(16) => self.u16,
-            IntType { signed: false, width: IntWidth::Bits(x) } if x == nzu16!(32) => self.u32,
-            IntType { signed: false, width: IntWidth::Bits(x) } if x == nzu16!(64) => self.u64,
-            IntType { signed: false, width: IntWidth::Bits(x) } if x == nzu16!(128) => self.u128,
+            IntType {
+                signed: true,
+                width: IntWidth::Bits(x),
+            } if x == nzu16!(8) => self.i8,
+            IntType {
+                signed: true,
+                width: IntWidth::Bits(x),
+            } if x == nzu16!(16) => self.i16,
+            IntType {
+                signed: true,
+                width: IntWidth::Bits(x),
+            } if x == nzu16!(32) => self.i32,
+            IntType {
+                signed: true,
+                width: IntWidth::Bits(x),
+            } if x == nzu16!(64) => self.i64,
+            IntType {
+                signed: true,
+                width: IntWidth::Bits(x),
+            } if x == nzu16!(128) => self.i128,
+            IntType {
+                signed: false,
+                width: IntWidth::Bits(x),
+            } if x == nzu16!(8) => self.u8,
+            IntType {
+                signed: false,
+                width: IntWidth::Bits(x),
+            } if x == nzu16!(16) => self.u16,
+            IntType {
+                signed: false,
+                width: IntWidth::Bits(x),
+            } if x == nzu16!(32) => self.u32,
+            IntType {
+                signed: false,
+                width: IntWidth::Bits(x),
+            } if x == nzu16!(64) => self.u64,
+            IntType {
+                signed: false,
+                width: IntWidth::Bits(x),
+            } if x == nzu16!(128) => self.u128,
             _ => unreachable!(),
         })
     }

diff --git a/rust/src/sema/mir/transform/remove_discard.rs b/rust/src/sema/mir/transform/remove_discard.rs
@@ -0,0 +1 @@
+
diff --git a/rust/src/sema/tyck.rs b/rust/src/sema/tyck.rs
@@ -1179,7 +1179,12 @@ pub struct Inferer<'a> {
 }
 
 impl<'a> Inferer<'a> {
-    pub fn new(defs: &'a Definitions, curdef: DefId, curmod: DefId, vardefs: &'a mut HashMap<HirVarId, ThirVarDef>) -> Self {
+    pub fn new(
+        defs: &'a Definitions,
+        curdef: DefId,
+        curmod: DefId,
+        vardefs: &'a mut HashMap<HirVarId, ThirVarDef>,
+    ) -> Self {
         Self {
             defs,
             curdef,
@@ -1665,7 +1670,6 @@ impl<'a> Inferer<'a> {
                 let mut ty = std::mem::replace(&mut *self.vardefs[var].ty, Type::Never);
                 status &= self.propagate_type(&mut ty)?;
                 *self.vardefs[var].ty = ty;
-
             }
             ThirStatement::Return(ret) => status &= self.propagate_expr(ret)?,
             ThirStatement::Block(blk) => status &= self.propagate_block(blk)?,