carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 22:02:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Switch SourceBuffer to diagnostics. (#3197)

Browse Source 
This updates SourceBuffer to diagnostics. Some additional edits to
diagnostics were necessary due to issues moving arguments around, which
seems to stem from a compile error with clang 14 (fixed in later
versions).

---------

Co-authored-by: Richard Smith <richard@metafoo.co.uk>
This commit is contained in:
Jon Ross-Perkins
2023-09-07 23:02:10 +00:00
committed by GitHub
co-authored by Richard Smith
parent 71e9fb7511
commit bc63e6ae0a
15 changed files with 104 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/source/source_buffer_test.cpp
+9 -4
View File
@@ -8,6 +8,7 @@
#include "common/check.h"
#include "llvm/Support/VirtualFileSystem.h"
#include "toolchain/diagnostics/diagnostic_emitter.h"
namespace Carbon::Testing {
namespace {
@@ -16,7 +17,8 @@ static constexpr llvm::StringLiteral TestFileName = "test.carbon";
TEST(SourceBufferTest, MissingFile) {
llvm::vfs::InMemoryFileSystem fs;
auto buffer = SourceBuffer::CreateFromFile(fs, llvm::errs(), TestFileName);
auto buffer = SourceBuffer::CreateFromFile(fs, TestFileName,
ConsoleDiagnosticConsumer());
EXPECT_FALSE(buffer);
}
@@ -25,7 +27,8 @@ TEST(SourceBufferTest, SimpleFile) {
CARBON_CHECK(fs.addFile(TestFileName, /*ModificationTime=*/0,
llvm::MemoryBuffer::getMemBuffer("Hello World")));
auto buffer = SourceBuffer::CreateFromFile(fs, llvm::errs(), TestFileName);
auto buffer = SourceBuffer::CreateFromFile(fs, TestFileName,
ConsoleDiagnosticConsumer());
ASSERT_TRUE(buffer);
EXPECT_EQ(TestFileName, buffer->filename());
@@ -41,7 +44,8 @@ TEST(SourceBufferTest, NoNull) {
/*BufferName=*/"",
/*RequiresNullTerminator=*/false)));
auto buffer = SourceBuffer::CreateFromFile(fs, llvm::errs(), TestFileName);
auto buffer = SourceBuffer::CreateFromFile(fs, TestFileName,
ConsoleDiagnosticConsumer());
ASSERT_TRUE(buffer);
EXPECT_EQ(TestFileName, buffer->filename());
@@ -53,7 +57,8 @@ TEST(SourceBufferTest, EmptyFile) {
CARBON_CHECK(fs.addFile(TestFileName, /*ModificationTime=*/0,
llvm::MemoryBuffer::getMemBuffer("")));
auto buffer = SourceBuffer::CreateFromFile(fs, llvm::errs(), TestFileName);
auto buffer = SourceBuffer::CreateFromFile(fs, TestFileName,
ConsoleDiagnosticConsumer());
ASSERT_TRUE(buffer);
EXPECT_EQ(TestFileName, buffer->filename());