Added more trait item stripping

Fixed lack of AST:: prepending in rust-parse-impl.h - should prevent compilation error

Fixed expr renaming in Method as_string, should prevent compile error

Fixed issue with changing location accessibility for AST nodes

Fixed rust-compile.cc not using get_locus() instead of .locus

1 files changed, 1 insertions, 11 deletions

diff --git a/gcc/rust/ast/rust-ast-full-test.cc b/gcc/rust/ast/rust-ast-full-test.cc
index 1e95e47..8071226 100644
--- a/gcc/rust/ast/rust-ast-full-test.cc
+++ b/gcc/rust/ast/rust-ast-full-test.cc
@@ -678,33 +678,23 @@ Method::as_string () const
   else
     {
       for (const auto &param : function_params)
-	{
 	  str += "\n  " + param.as_string ();
-	}
     }
 
   str += "\n Return type: ";
   if (has_return_type ())
-    {
       str += return_type->as_string ();
-    }
   else
-    {
       str += "none (void)";
-    }
 
   str += "\n Where clause: ";
   if (has_where_clause ())
-    {
       str += where_clause.as_string ();
-    }
   else
-    {
       str += "none";
-    }
 
   str += "\n Block expr (body): \n  ";
-  str += expr->as_string ();
+  str += function_body->as_string ();
 
   return str;
 }