Merge pull request #26 from tfoleyNV/cleanup

Cleanup

1 files changed, 5 insertions, 11 deletions

diff --git a/source/slang/diagnostics.cpp b/source/slang/diagnostics.cpp
index d8527466b..45c0c9b76 100644
--- a/source/slang/diagnostics.cpp
+++ b/source/slang/diagnostics.cpp
@@ -15,7 +15,6 @@
 #endif
 
 namespace Slang {
-namespace Compiler {
 
 void printDiagnosticArg(StringBuilder& sb, char const* str)
 {
@@ -27,7 +26,7 @@ void printDiagnosticArg(StringBuilder& sb, int str)
     sb << str;
 }
 
-void printDiagnosticArg(StringBuilder& sb, CoreLib::Basic::String const& str)
+void printDiagnosticArg(StringBuilder& sb, Slang::String const& str)
 {
     sb << str;
 }
@@ -37,11 +36,6 @@ void printDiagnosticArg(StringBuilder& sb, Decl* decl)
     sb << decl->Name.Content;
 }
 
-void printDiagnosticArg(StringBuilder& sb, Type* type)
-{
-    sb << type->DataType->ToString();
-}
-
 void printDiagnosticArg(StringBuilder& sb, ExpressionType* type)
 {
     sb << type->ToString();
@@ -175,10 +169,10 @@ void DiagnosticSink::diagnoseImpl(CodePosition const& pos, DiagnosticInfo const&
     if( callback )
     {
         // If so, pass the error string along to them
-        StringBuilder sb;
-        formatDiagnostic(sb, diagnostic);
+        StringBuilder messageBuilder;
+        formatDiagnostic(messageBuilder, diagnostic);
 
-        callback(sb.ProduceString().begin(), callbackUserData);
+        callback(messageBuilder.ProduceString().begin(), callbackUserData);
     }
     else
     {
@@ -201,4 +195,4 @@ namespace Diagnostics
 }
 
 
-}} // namespace Slang::Compiler
+} // namespace Slang