make int_unsuffixed_lit to generic function so we can produce Signed Literal in IntLit

Author: bungcip

c2rust-ast-builder/src/builder.rs

@@ -500,6 +500,36 @@ impl Make<Signature> for Box<FnDecl> {
     }
 }
 
+impl Make<String> for i32 {
+    fn make(self, mk: &Builder) -> String {
+        (self as i128).make(mk)
+    }
+}
+
+impl Make<String> for i64 {
+    fn make(self, mk: &Builder) -> String {
+        (self as i128).make(mk)
+    }
+}
+
+impl Make<String> for u64 {
+    fn make(self, mk: &Builder) -> String {
+        (self as u128).make(mk)
+    }
+}
+
+impl Make<String> for i128 {
+    fn make(self, _mk: &Builder) -> String {
+        self.to_string()
+    }
+}
+
+impl Make<String> for u128 {
+    fn make(self, _mk: &Builder) -> String {
+        self.to_string()
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct Builder {
     // The builder holds a set of "modifiers", such as visibility and mutability.  Functions for
@@ -1067,8 +1097,12 @@ impl Builder {
         Lit::Int(LitInt::new(&format!("{}{}", i, ty), self.span))
     }
 
-    pub fn int_unsuffixed_lit(self, i: u128) -> Lit {
-        Lit::Int(LitInt::new(&format!("{}", i), self.span))
+    pub fn int_unsuffixed_lit<S>(self, s: S) -> Lit
+    where
+        S: Make<String>,
+    {
+        let s = s.make(&self);
+        Lit::Int(LitInt::new(&s, self.span))
     }
 
     pub fn float_lit(self, s: &str, ty: &str) -> Lit {

c2rust-transpile/src/cfg/mod.rs

@@ -1860,8 +1860,8 @@ impl CfgBuilder {
                 let pat = match branch {
                     Some(pat) => pat,
                     None => match cie {
-                        ConstIntExpr::U(n) => mk().lit_pat(mk().int_unsuffixed_lit(n as u128)),
-                        ConstIntExpr::I(n) => mk().lit_pat(mk().int_unsuffixed_lit(n as u128)),
+                        ConstIntExpr::U(n) => mk().lit_pat(mk().int_unsuffixed_lit(n)),
+                        ConstIntExpr::I(n) => mk().lit_pat(mk().int_unsuffixed_lit(n)),
                     },
                 };
 

c2rust-transpile/src/translator/literals.rs

@@ -16,7 +16,7 @@ impl<'c> Translation<'c> {
         base: IntBase,
     ) -> TranslationResult<Box<Expr>> {
         let lit = match base {
-            IntBase::Dec => mk().int_unsuffixed_lit(val.into()),
+            IntBase::Dec => mk().int_unsuffixed_lit(val),
             IntBase::Hex => mk().float_unsuffixed_lit(&format!("0x{:x}", val)),
             IntBase::Oct => mk().float_unsuffixed_lit(&format!("0o{:o}", val)),
         };

c2rust-transpile/src/translator/structs.rs

@@ -313,7 +313,7 @@ impl<'a> Translation<'a> {
                 } => {
                     let ty = mk().array_ty(
                         mk().ident_ty("u8"),
-                        mk().lit_expr(mk().int_unsuffixed_lit(bytes.into())),
+                        mk().lit_expr(mk().int_unsuffixed_lit(bytes)),
                     );
                     let mut field = mk();
                     let field_attrs = attrs.iter().map(|attr| {
@@ -340,7 +340,7 @@ impl<'a> Translation<'a> {
                     let field_name = next_padding_field();
                     let ty = mk().array_ty(
                         mk().ident_ty("u8"),
-                        mk().lit_expr(mk().int_unsuffixed_lit(bytes.into())),
+                        mk().lit_expr(mk().int_unsuffixed_lit(bytes)),
                     );
 
                     // Mark it with `#[bitfield(padding)]`
@@ -442,7 +442,7 @@ impl<'a> Translation<'a> {
                 } => {
                     let array_expr = mk().repeat_expr(
                         mk().lit_expr(mk().int_unsuffixed_lit(0)),
-                        mk().lit_expr(mk().int_unsuffixed_lit(bytes.into())),
+                        mk().lit_expr(mk().int_unsuffixed_lit(bytes)),
                     );
                     let field = mk().field(field_name, array_expr);
 
@@ -452,7 +452,7 @@ impl<'a> Translation<'a> {
                     let field_name = next_padding_field();
                     let array_expr = mk().repeat_expr(
                         mk().lit_expr(mk().int_unsuffixed_lit(0)),
-                        mk().lit_expr(mk().int_unsuffixed_lit(bytes.into())),
+                        mk().lit_expr(mk().int_unsuffixed_lit(bytes)),
                     );
                     let field = mk().field(field_name, array_expr);
 
@@ -612,7 +612,7 @@ impl<'a> Translation<'a> {
                 } => {
                     let array_expr = mk().repeat_expr(
                         mk().lit_expr(mk().int_unsuffixed_lit(0)),
-                        mk().lit_expr(mk().int_unsuffixed_lit(bytes.into())),
+                        mk().lit_expr(mk().int_unsuffixed_lit(bytes)),
                     );
                     let field = mk().field(field_name, array_expr);
 
@@ -622,7 +622,7 @@ impl<'a> Translation<'a> {
                     let field_name = next_padding_field();
                     let array_expr = mk().repeat_expr(
                         mk().lit_expr(mk().int_unsuffixed_lit(0)),
-                        mk().lit_expr(mk().int_unsuffixed_lit(bytes.into())),
+                        mk().lit_expr(mk().int_unsuffixed_lit(bytes)),
                     );
                     let field = mk().field(field_name, array_expr);