[PATCH] D159441: [include-cleaner] Weaken signal for boosting preferred headers
Kadir Cetinkaya via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Wed Sep 6 05:49:34 PDT 2023
This revision was automatically updated to reflect the committed changes.
Closed by commit rG73b2c86d95dc: [include-cleaner] Weaken signal for boosting preferred headers (authored by kadircet).
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D159441/new/
https://reviews.llvm.org/D159441
Files:
clang-tools-extra/include-cleaner/lib/TypesInternal.h
clang-tools-extra/include-cleaner/unittests/FindHeadersTest.cpp
Index: clang-tools-extra/include-cleaner/unittests/FindHeadersTest.cpp
===================================================================
--- clang-tools-extra/include-cleaner/unittests/FindHeadersTest.cpp
+++ clang-tools-extra/include-cleaner/unittests/FindHeadersTest.cpp
@@ -344,7 +344,7 @@
}
TEST_F(HeadersForSymbolTest, Ranking) {
- // Sorting is done over (canonical, public, complete, origin)-tuple.
+ // Sorting is done over (public, complete, canonical, origin)-tuple.
Inputs.Code = R"cpp(
#include "private.h"
#include "public.h"
@@ -363,11 +363,11 @@
)cpp");
Inputs.ExtraFiles["public_complete.h"] = guard("struct foo {};");
buildAST();
- EXPECT_THAT(headersForFoo(), ElementsAre(Header("\"canonical.h\""),
- physicalHeader("public_complete.h"),
- physicalHeader("public.h"),
- physicalHeader("exporter.h"),
- physicalHeader("private.h")));
+ EXPECT_THAT(headersForFoo(),
+ ElementsAre(physicalHeader("public_complete.h"),
+ Header("\"canonical.h\""), physicalHeader("public.h"),
+ physicalHeader("exporter.h"),
+ physicalHeader("private.h")));
}
TEST_F(HeadersForSymbolTest, PreferPublicOverComplete) {
@@ -391,14 +391,11 @@
#include "public_complete.h"
#include "test/foo.fwd.h"
)cpp";
- Inputs.ExtraFiles["public_complete.h"] = guard(R"cpp(
- struct foo {};
- )cpp");
+ Inputs.ExtraFiles["public_complete.h"] = guard("struct foo {};");
Inputs.ExtraFiles["test/foo.fwd.h"] = guard("struct foo;");
buildAST();
- EXPECT_THAT(headersForFoo(),
- ElementsAre(physicalHeader("test/foo.fwd.h"),
- physicalHeader("public_complete.h")));
+ EXPECT_THAT(headersForFoo(), ElementsAre(physicalHeader("public_complete.h"),
+ physicalHeader("test/foo.fwd.h")));
}
TEST_F(HeadersForSymbolTest, MainFile) {
Index: clang-tools-extra/include-cleaner/lib/TypesInternal.h
===================================================================
--- clang-tools-extra/include-cleaner/lib/TypesInternal.h
+++ clang-tools-extra/include-cleaner/lib/TypesInternal.h
@@ -66,13 +66,13 @@
/// Symbol is directly originating from this header, rather than being
/// exported or included transitively.
OriginHeader = 1 << 0,
- /// Provides a generally-usable definition for the symbol. (a function decl,
- /// or class definition and not a forward declaration of a template).
- CompleteSymbol = 1 << 1,
/// Header providing the symbol is explicitly marked as preferred, with an
/// IWYU private pragma that points at this provider or header and symbol has
/// ~the same name.
- PreferredHeader = 1 << 2,
+ PreferredHeader = 1 << 1,
+ /// Provides a generally-usable definition for the symbol. (a function decl,
+ /// or class definition and not a forward declaration of a template).
+ CompleteSymbol = 1 << 2,
/// Symbol is provided by a public file. Only absent in the cases where file
/// is explicitly marked as such, non self-contained or IWYU private
/// pragmas.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D159441.556015.patch
Type: text/x-patch
Size: 3282 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20230906/9e74df43/attachment.bin>
More information about the cfe-commits
mailing list