diff options
| author | Philip Herron <herron.philip@googlemail.com> | 2020-04-14 09:41:57 +0100 |
|---|---|---|
| committer | Philip Herron <philip.herron@embecosm.com> | 2020-11-27 17:02:36 +0000 |
| commit | 1ff5f98ee698fc4443c33254bc79fc3baab0d3cf (patch) | |
| tree | d8ee27c3de5cf13ee2b5af86577e612747d529e9 | |
| parent | 52243e9b3960cae794c56498e4d2dfe6dfaa82cc (diff) | |
| download | gcc-1ff5f98ee698fc4443c33254bc79fc3baab0d3cf.zip gcc-1ff5f98ee698fc4443c33254bc79fc3baab0d3cf.tar.gz gcc-1ff5f98ee698fc4443c33254bc79fc3baab0d3cf.tar.bz2 | |
Fix broken build
| -rw-r--r-- | gcc/rust/Make-lang.in | 1 | ||||
| -rw-r--r-- | gcc/rust/lex/rust-token.cc | 6 |
2 files changed, 3 insertions, 4 deletions
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 +} |