Skip to content

Commit 714466b

Browse files
committed
Revert "[clang-tidy] New check: bugprone-suspicious-include"
This reverts commit 1e0669b (and follow-ups 698a127 and 52bbdad). The tests fail fail on Windows, see https://reviews.llvm.org/D74669
1 parent 877073b commit 714466b

File tree

16 files changed

+4
-256
lines changed

16 files changed

+4
-256
lines changed

clang-tools-extra/clang-tidy/bugprone/BugproneTidyModule.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
#include "StringIntegerAssignmentCheck.h"
4646
#include "StringLiteralWithEmbeddedNulCheck.h"
4747
#include "SuspiciousEnumUsageCheck.h"
48-
#include "SuspiciousIncludeCheck.h"
4948
#include "SuspiciousMemsetUsageCheck.h"
5049
#include "SuspiciousMissingCommaCheck.h"
5150
#include "SuspiciousSemicolonCheck.h"
@@ -141,8 +140,6 @@ class BugproneModule : public ClangTidyModule {
141140
"bugprone-string-literal-with-embedded-nul");
142141
CheckFactories.registerCheck<SuspiciousEnumUsageCheck>(
143142
"bugprone-suspicious-enum-usage");
144-
CheckFactories.registerCheck<SuspiciousIncludeCheck>(
145-
"bugprone-suspicious-include");
146143
CheckFactories.registerCheck<SuspiciousMemsetUsageCheck>(
147144
"bugprone-suspicious-memset-usage");
148145
CheckFactories.registerCheck<SuspiciousMissingCommaCheck>(

clang-tools-extra/clang-tidy/bugprone/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ add_clang_library(clangTidyBugproneModule
3737
StringIntegerAssignmentCheck.cpp
3838
StringLiteralWithEmbeddedNulCheck.cpp
3939
SuspiciousEnumUsageCheck.cpp
40-
SuspiciousIncludeCheck.cpp
4140
SuspiciousMemsetUsageCheck.cpp
4241
SuspiciousMissingCommaCheck.cpp
4342
SuspiciousSemicolonCheck.cpp

clang-tools-extra/clang-tidy/bugprone/SuspiciousIncludeCheck.cpp

Lines changed: 0 additions & 105 deletions
This file was deleted.

clang-tools-extra/clang-tidy/bugprone/SuspiciousIncludeCheck.h

Lines changed: 0 additions & 57 deletions
This file was deleted.

clang-tools-extra/clang-tidy/utils/FileExtensionsUtils.cpp

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,13 @@ bool parseFileExtensions(StringRef AllFileExtensions,
5353
return true;
5454
}
5555

56-
llvm::Optional<StringRef>
57-
getFileExtension(StringRef FileName, const FileExtensionsSet &FileExtensions) {
56+
bool isFileExtension(StringRef FileName,
57+
const FileExtensionsSet &FileExtensions) {
5858
StringRef Extension = llvm::sys::path::extension(FileName);
5959
if (Extension.empty())
60-
return llvm::None;
60+
return false;
6161
// Skip "." prefix.
62-
if (!FileExtensions.count(Extension.substr(1)))
63-
return llvm::None;
64-
return Extension;
65-
}
66-
67-
bool isFileExtension(StringRef FileName,
68-
const FileExtensionsSet &FileExtensions) {
69-
return getFileExtension(FileName, FileExtensions).hasValue();
62+
return FileExtensions.count(Extension.substr(1)) > 0;
7063
}
7164

7265
} // namespace utils

clang-tools-extra/clang-tidy/utils/FileExtensionsUtils.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
#include "clang/Basic/SourceLocation.h"
1313
#include "clang/Basic/SourceManager.h"
14-
#include "llvm/ADT/Optional.h"
1514
#include "llvm/ADT/SmallSet.h"
1615
#include "llvm/ADT/StringRef.h"
1716

@@ -37,12 +36,6 @@ bool isSpellingLocInHeaderFile(SourceLocation Loc, SourceManager &SM,
3736
/// extensions.
3837
inline StringRef defaultHeaderFileExtensions() { return ";h;hh;hpp;hxx"; }
3938

40-
/// Returns recommended default value for the list of implementaiton file
41-
/// extensions.
42-
inline StringRef defaultImplementationFileExtensions() {
43-
return "c;cc;cpp;cxx";
44-
}
45-
4639
/// Returns recommended default value for the list of file extension
4740
/// delimiters.
4841
inline StringRef defaultFileExtensionDelimiters() { return ",;"; }
@@ -52,11 +45,6 @@ bool parseFileExtensions(StringRef AllFileExtensions,
5245
FileExtensionsSet &FileExtensions,
5346
StringRef Delimiters);
5447

55-
/// Decides whether a file has a header file extension.
56-
/// Returns the file extension, if included in the provided set.
57-
llvm::Optional<StringRef>
58-
getFileExtension(StringRef FileName, const FileExtensionsSet &FileExtensions);
59-
6048
/// Decides whether a file has one of the specified file extensions.
6149
bool isFileExtension(StringRef FileName,
6250
const FileExtensionsSet &FileExtensions);

clang-tools-extra/docs/ReleaseNotes.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,13 +82,6 @@ New checks
8282

8383
Checks for usages of identifiers reserved for use by the implementation.
8484

85-
- New :doc:`bugprone-suspicious-include
86-
<clang-tidy/checks/bugprone-suspicious-include>` check.
87-
88-
Finds cases where an include refers to what appears to be an implementation
89-
file, which often leads to hard-to-track-down ODR violations, and diagnoses
90-
them.
91-
9285
- New :doc:`cert-oop57-cpp
9386
<clang-tidy/checks/cert-oop57-cpp>` check.
9487

clang-tools-extra/docs/clang-tidy/checks/bugprone-suspicious-include.rst

Lines changed: 0 additions & 33 deletions
This file was deleted.

clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/a

Whitespace-only changes.

clang-tools-extra/test/clang-tidy/checkers/Inputs/Headers/a.cpp

Whitespace-only changes.

0 commit comments

Comments
 (0)