Skip to content

[include-cleaner] rename enabled flags to disable-* #132991

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
May 1, 2025
Merged

[include-cleaner] rename enabled flags to disable-* #132991

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
c476948
[include-cleaner] rename enabled flags to `disable-*`
hulxv Mar 25, 2025
e2f78ab
[include-cleaner] return `--remove` and `--insert` to be in deprecati…
hulxv Apr 18, 2025
b7dd110
[clang-tools-extra] add note for deprecation of `-remove` and `-insert`
hulxv Apr 25, 2025
6932115
[include-cleaner] warning when the deprecated commands are used
hulxv Apr 25, 2025
573eed8
[include-cleaner] refer to the main issue instead of the PR
hulxv Apr 25, 2025
dd552fc
improve the warning message
hulxv Apr 25, 2025
30ea7f1
[include-cleaner] testing display warnings of deprecated commands
hulxv Apr 25, 2025
d9d8481
reformatting deprectation warning message
hulxv Apr 30, 2025
221d693
missed changes
hulxv Apr 30, 2025
b609e35
fix warning tests
hulxv Apr 30, 2025
a858a86
fix formatting
hulxv Apr 30, 2025
46293f0
fix failed tests
hulxv Apr 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions clang-tools-extra/include-cleaner/test/tool.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ int x = foo();
// CHANGE: - "foobar.h"
// CHANGE-NEXT: + "foo.h"

// RUN: clang-include-cleaner -remove=0 -print=changes %s -- -I%S/Inputs/ | FileCheck --check-prefix=INSERT %s
// RUN: clang-include-cleaner -disable-remove -print=changes %s -- -I%S/Inputs/ | FileCheck --check-prefix=INSERT %s
// INSERT-NOT: - "foobar.h"
// INSERT: + "foo.h"

// RUN: clang-include-cleaner -insert=0 -print=changes %s -- -I%S/Inputs/ | FileCheck --check-prefix=REMOVE %s
// RUN: clang-include-cleaner -disable-insert -print=changes %s -- -I%S/Inputs/ | FileCheck --check-prefix=REMOVE %s
// REMOVE: - "foobar.h"
// REMOVE-NOT: + "foo.h"

Expand Down
17 changes: 14 additions & 3 deletions clang-tools-extra/include-cleaner/tool/IncludeCleaner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ cl::opt<bool> Edit{
cl::desc("Apply edits to analyzed source files"),
cl::cat(IncludeCleaner),
};

cl::opt<bool> Insert{
"insert",
cl::desc("Allow header insertions"),
Expand All @@ -103,6 +102,18 @@ cl::opt<bool> Remove{
cl::init(true),
cl::cat(IncludeCleaner),
};
cl::opt<bool> DisableInsert{
"disable-insert",
cl::desc("Disable header insertions"),
cl::init(false),
cl::cat(IncludeCleaner),
};
cl::opt<bool> DisableRemove{
"disable-remove",
cl::desc("Disable header removals"),
cl::init(false),
cl::cat(IncludeCleaner),
};

std::atomic<unsigned> Errors = ATOMIC_VAR_INIT(0);

Expand Down Expand Up @@ -183,9 +194,9 @@ class Action : public clang::ASTFrontendAction {
auto Results =
analyze(AST.Roots, PP.MacroReferences, PP.Includes, &PI,
getCompilerInstance().getPreprocessor(), HeaderFilter);
if (!Insert)
if (!Insert || DisableInsert)
Results.Missing.clear();
if (!Remove)
if (!Remove || DisableRemove)
Results.Unused.clear();
std::string Final = fixIncludes(Results, AbsPath, Code, getStyle(AbsPath));

Expand Down
Loading