From 1ff5f98ee698fc4443c33254bc79fc3baab0d3cf Mon Sep 17 00:00:00 2001
From: Philip Herron <herron.philip@googlemail.com>
Date: Tue, 14 Apr 2020 09:41:57 +0100
Subject: Fix broken build

---
 gcc/rust/Make-lang.in      | 1 -
 gcc/rust/lex/rust-token.cc | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'gcc')

diff --git a/gcc/rust/Make-lang.in b/gcc/rust/Make-lang.in
index 588a05e..9324cb4 100644
--- a/gcc/rust/Make-lang.in
+++ b/gcc/rust/Make-lang.in
@@ -67,7 +67,6 @@ GRS_OBJS = \
     rust/rust-token.o \
     rust/rust-lex.o \
     rust/rust-parse.o \
-    rust/rust-scope.o \
     rust/rust-ast-full-test.o \
     rust/rust-session-manager.o \
     $(END)
diff --git a/gcc/rust/lex/rust-token.cc b/gcc/rust/lex/rust-token.cc
index 47bf750..4b71dd8 100644
--- a/gcc/rust/lex/rust-token.cc
+++ b/gcc/rust/lex/rust-token.cc
@@ -1,6 +1,6 @@
 #include "rust-token.h"
 
-#include "diagnostic.h" // for error_at
+#include "rust-diagnostics.h" // for error_at
 
 namespace Rust {
     // Hackily defined way to get token description for enum value using x-macros
@@ -89,7 +89,7 @@ namespace Rust {
         static const ::std::string empty = "";
 
         if (str == NULL) {
-            error_at(get_locus(),
+            rust_error_at(get_locus(),
               "attempted to get string for '%s', which has no string. returning empty string "
               "instead.",
               get_token_description());
@@ -97,4 +97,4 @@ namespace Rust {
         }
         return *str;
     }
-}
\ No newline at end of file
+}
-- 
cgit v1.1