From 00c2e09f432e737eff6ca90aef1aad165641b9bb Mon Sep 17 00:00:00 2001
From: Patrick Ventuzelo <ventuzelo.patrick@gmail.com>
Date: Mon, 16 Sep 2019 11:00:03 +0200
Subject: [PATCH] fix CodeGen message type

---
 lib/singlepass-backend/src/codegen_x64.rs | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/singlepass-backend/src/codegen_x64.rs b/lib/singlepass-backend/src/codegen_x64.rs
index 56305b430..a12b2557f 100644
--- a/lib/singlepass-backend/src/codegen_x64.rs
+++ b/lib/singlepass-backend/src/codegen_x64.rs
@@ -353,7 +353,7 @@ impl RunnableModule for X64ExecutionContext {
 
 #[derive(Debug)]
 pub struct CodegenError {
-    pub message: &'static str,
+    pub message: String,
 }
 
 #[derive(Copy, Clone, Debug)]
@@ -474,7 +474,7 @@ impl ModuleCodeGenerator<X64FunctionCode, X64ExecutionContext, CodegenError>
                 Some(x) => x,
                 None => {
                     return Err(CodegenError {
-                        message: "label not found",
+                        message: format!("label not found"),
                     });
                 }
             };
@@ -482,7 +482,7 @@ impl ModuleCodeGenerator<X64FunctionCode, X64ExecutionContext, CodegenError>
                 Some(x) => x,
                 None => {
                     return Err(CodegenError {
-                        message: "offset is none",
+                        message: format!("offset is none"),
                     });
                 }
             };
@@ -3875,7 +3875,7 @@ impl FunctionCodeGenerator<CodegenError> for X64FunctionCode {
                         WpTypeOrFuncType::Type(inner_ty) => smallvec![inner_ty],
                         _ => {
                             return Err(CodegenError {
-                                message: "multi-value returns not yet implemented",
+                                message: format!("multi-value returns not yet implemented"),
                             })
                         }
                     },
@@ -3986,7 +3986,7 @@ impl FunctionCodeGenerator<CodegenError> for X64FunctionCode {
                         WpTypeOrFuncType::Type(inner_ty) => smallvec![inner_ty],
                         _ => {
                             return Err(CodegenError {
-                                message: "multi-value returns not yet implemented",
+                                message: format!("multi-value returns not yet implemented"),
                             })
                         }
                     },
@@ -4015,7 +4015,7 @@ impl FunctionCodeGenerator<CodegenError> for X64FunctionCode {
                         WpTypeOrFuncType::Type(inner_ty) => smallvec![inner_ty],
                         _ => {
                             return Err(CodegenError {
-                                message: "multi-value returns not yet implemented",
+                                message: format!("multi-value returns not yet implemented"),
                             })
                         }
                     },
@@ -4979,8 +4979,7 @@ impl FunctionCodeGenerator<CodegenError> for X64FunctionCode {
             }
             _ => {
                 return Err(CodegenError {
-                    message: "not yet implemented: {:?}",
-                    op,
+                    message: format!("not yet implemented: {:?}", op),
                 });
             }
         }