mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-26 22:02:30 +01:00
Jon Ross-Perkins
b9df8ca765
A lot of this is more boring "remove unused header", plus some other minor cleanups. I think the most significant changes were: - yaml_test_helpers.cpp is doing a switch on an unsigned int, comparing to enum values. - [bugprone-switch-missing-default-case](https://clang.llvm.org/extra/clang-tidy/checks/bugprone/switch-missing-default-case.html) is unhappy with EnumBase, but correctly identified yaml_test_helpers.cpp, so I'm opting to address it rather than disabling it even though it needs NOLINT in several locations as a result, in addition to what I think are some low-value `default` cases. I'd be fine going the other way with this too and disabling it globally (I could see it being noisier in the explorer). - MarkInitializerFor swaps the argument names between the .h and .cpp. I think the .cpp had the order as intended. - There's a new-ish [performance-enum-size](https://clang.llvm.org/extra/clang-tidy/checks/performance/enum-size.html) which I'm basically treating as "add int8_t to enums". My main motivation here is to just clean up as many of these as I can so that I stop seeing them in vscode.
65 lines
2.6 KiB
C++
65 lines
2.6 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 "toolchain/diagnostics/sorting_diagnostic_consumer.h"
|
|
|
|
#include <gmock/gmock.h>
|
|
#include <gtest/gtest.h>
|
|
|
|
#include "llvm/ADT/StringRef.h"
|
|
#include "toolchain/diagnostics/diagnostic_emitter.h"
|
|
#include "toolchain/diagnostics/mocks.h"
|
|
|
|
namespace Carbon::Testing {
|
|
namespace {
|
|
|
|
using ::testing::InSequence;
|
|
|
|
CARBON_DIAGNOSTIC(TestDiagnostic, Error, "{0}", llvm::StringRef);
|
|
|
|
struct FakeDiagnosticLocationTranslator
|
|
: DiagnosticLocationTranslator<DiagnosticLocation> {
|
|
auto GetLocation(DiagnosticLocation loc) -> DiagnosticLocation override {
|
|
return loc;
|
|
}
|
|
};
|
|
|
|
TEST(SortedDiagnosticEmitterTest, SortErrors) {
|
|
FakeDiagnosticLocationTranslator translator;
|
|
Testing::MockDiagnosticConsumer consumer;
|
|
SortingDiagnosticConsumer sorting_consumer(consumer);
|
|
DiagnosticEmitter<DiagnosticLocation> emitter(translator, sorting_consumer);
|
|
|
|
emitter.Emit({"f", "line", 2, 1}, TestDiagnostic, "M1");
|
|
emitter.Emit({"f", "line", 1, 1}, TestDiagnostic, "M2");
|
|
emitter.Emit({"f", "line", 1, 3}, TestDiagnostic, "M3");
|
|
emitter.Emit({"f", "line", 3, 4}, TestDiagnostic, "M4");
|
|
emitter.Emit({"f", "line", 3, 2}, TestDiagnostic, "M5");
|
|
emitter.Emit({"f", "line", 3, 2}, TestDiagnostic, "M6");
|
|
|
|
InSequence s;
|
|
EXPECT_CALL(consumer, HandleDiagnostic(
|
|
IsDiagnostic(DiagnosticKind::TestDiagnostic,
|
|
DiagnosticLevel::Error, 1, 1, "M2")));
|
|
EXPECT_CALL(consumer, HandleDiagnostic(
|
|
IsDiagnostic(DiagnosticKind::TestDiagnostic,
|
|
DiagnosticLevel::Error, 1, 3, "M3")));
|
|
EXPECT_CALL(consumer, HandleDiagnostic(
|
|
IsDiagnostic(DiagnosticKind::TestDiagnostic,
|
|
DiagnosticLevel::Error, 2, 1, "M1")));
|
|
EXPECT_CALL(consumer, HandleDiagnostic(
|
|
IsDiagnostic(DiagnosticKind::TestDiagnostic,
|
|
DiagnosticLevel::Error, 3, 2, "M5")));
|
|
EXPECT_CALL(consumer, HandleDiagnostic(
|
|
IsDiagnostic(DiagnosticKind::TestDiagnostic,
|
|
DiagnosticLevel::Error, 3, 2, "M6")));
|
|
EXPECT_CALL(consumer, HandleDiagnostic(
|
|
IsDiagnostic(DiagnosticKind::TestDiagnostic,
|
|
DiagnosticLevel::Error, 3, 4, "M4")));
|
|
sorting_consumer.Flush();
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace Carbon::Testing
|