mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-30 19:55:00 +01:00
Chandler Carruth
d4a2d435b8
Most of these were fixed automatically (including things like adding `[[nodiscard]]` and such). A number of others required manual edits. I think all of them were pretty nice improvements. There were a few places where the issues really stem from external constraints and I've disabled the checks: GoogleTest macros or the specific LibFuzzer entry points. The only other places I disabled are the implicit conversions to a private `enum` in the classes wrapping those `enum`s. These implicit conversions are necessarily implicit to serve their only purpose: enabling their use in `switch` statements and `case` labels. When these were highlighted, it showed that one of these was actually converting to an *`int`*. I've switched that to use the private `enum` instead as doing so is important to enable warnings on non-covering `switch` statements over than `enum`. And indeed, there is a `switch` that was was implicitly relying on falling through in this way, so I've added the explicit documentation of the intentional pattern to address that warning. Sorry this is so large, all of this somewhat fell out of enabling the `clang-tidy` checks. If it is too difficult to review as lump, I can work on breaking it apart as needed. Just let me know.
85 lines
2.4 KiB
C++
85 lines
2.4 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "diagnostics/diagnostic_emitter.h"
|
|
|
|
#include "gmock/gmock.h"
|
|
#include "gtest/gtest.h"
|
|
#include "llvm/ADT/StringRef.h"
|
|
#include "llvm/Support/FormatVariadic.h"
|
|
|
|
namespace Carbon {
|
|
namespace {
|
|
|
|
using ::testing::ElementsAre;
|
|
using ::testing::Eq;
|
|
|
|
struct FakeDiagnostic {
|
|
static constexpr llvm::StringLiteral ShortName = "fake-diagnostic";
|
|
// TODO: consider ways to put the Message into `format` to allow dynamic
|
|
// selection of the message.
|
|
static constexpr llvm::StringLiteral Message = "{0}";
|
|
|
|
struct Substitutions {
|
|
std::string message;
|
|
};
|
|
static auto Format(const Substitutions& substitutions) -> std::string {
|
|
// Work around a bug in Clang's unused const variable warning by marking it
|
|
// used here with a no-op.
|
|
static_cast<void>(ShortName);
|
|
|
|
return llvm::formatv(Message.data(), substitutions.message).str();
|
|
}
|
|
};
|
|
|
|
TEST(DiagTest, EmitErrors) {
|
|
std::vector<std::string> reported;
|
|
|
|
DiagnosticEmitter emitter([&](const Diagnostic& diagnostic) {
|
|
EXPECT_THAT(diagnostic.short_name, Eq("fake-diagnostic"));
|
|
reported.push_back(diagnostic.message);
|
|
});
|
|
|
|
emitter.EmitError<FakeDiagnostic>(
|
|
[](FakeDiagnostic::Substitutions& diagnostic) {
|
|
diagnostic.message = "M1";
|
|
});
|
|
emitter.EmitError<FakeDiagnostic>(
|
|
[](FakeDiagnostic::Substitutions& diagnostic) {
|
|
diagnostic.message = "M2";
|
|
});
|
|
|
|
EXPECT_THAT(reported, ElementsAre("M1", "M2"));
|
|
}
|
|
|
|
TEST(DiagTest, EmitWarnings) {
|
|
std::vector<std::string> reported;
|
|
|
|
DiagnosticEmitter emitter([&](const Diagnostic& diagnostic) {
|
|
EXPECT_THAT(diagnostic.short_name, Eq("fake-diagnostic"));
|
|
reported.push_back(diagnostic.message);
|
|
});
|
|
|
|
emitter.EmitWarningIf<FakeDiagnostic>(
|
|
[](FakeDiagnostic::Substitutions& diagnostic) {
|
|
diagnostic.message = "M1";
|
|
return true;
|
|
});
|
|
emitter.EmitWarningIf<FakeDiagnostic>(
|
|
[](FakeDiagnostic::Substitutions& diagnostic) {
|
|
diagnostic.message = "M2";
|
|
return false;
|
|
});
|
|
emitter.EmitWarningIf<FakeDiagnostic>(
|
|
[](FakeDiagnostic::Substitutions& diagnostic) {
|
|
diagnostic.message = "M3";
|
|
return true;
|
|
});
|
|
|
|
EXPECT_THAT(reported, ElementsAre("M1", "M3"));
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace Carbon
|