stephanemoore created this revision.
stephanemoore added reviewers: benhamilton, aaron.ballman.
Herald added subscribers: cfe-commits, xazax.hun.
The `Acronyms` and `IncludeDefaultAcronyms` options were deprecated in
https://reviews.llvm.org/D51832. These options can be removed.
Tested by running the clang-tidy tests.
Repository:
rCTE Clang Tools Extra
https://reviews.llvm.org/D56945
Files:
clang-tidy/objc/PropertyDeclarationCheck.cpp
clang-tidy/objc/PropertyDeclarationCheck.h
docs/ReleaseNotes.rst
docs/clang-tidy/checks/objc-property-declaration.rst
Index: docs/clang-tidy/checks/objc-property-declaration.rst
===================================================================
--- docs/clang-tidy/checks/objc-property-declaration.rst
+++ docs/clang-tidy/checks/objc-property-declaration.rst
@@ -40,15 +40,3 @@
@property(nonatomic, assign) int abc_lowerCamelCase;
The corresponding style rule:
https://developer.apple.com/library/content/qa/qa1908/_index.html
-
-
-Options
--------
-
-.. option:: Acronyms
-
- This option is deprecated and ignored.
-
-.. option:: IncludeDefaultAcronyms
-
- This option is deprecated and ignored.
Index: docs/ReleaseNotes.rst
===================================================================
--- docs/ReleaseNotes.rst
+++ docs/ReleaseNotes.rst
@@ -245,6 +245,10 @@
suffix, and suggests to make the suffix uppercase. The list of destination
suffixes can be optionally provided.
+- The `Acronyms` and `IncludeDefaultAcronyms` options for the
+ :doc:`objc-property-declaration<clang-tidy/checks/objc-property-declaration>`
+ check have been removed.
+
- New alias :doc:`cert-dcl16-c
<clang-tidy/checks/cert-dcl16-c>` to
:doc:`readability-uppercase-literal-suffix
<clang-tidy/checks/readability-uppercase-literal-suffix>`
Index: clang-tidy/objc/PropertyDeclarationCheck.h
===================================================================
--- clang-tidy/objc/PropertyDeclarationCheck.h
+++ clang-tidy/objc/PropertyDeclarationCheck.h
@@ -11,8 +11,6 @@
#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_OBJC_PROPERTY_DECLARATION_H
#include "../ClangTidy.h"
-#include <string>
-#include <vector>
namespace clang {
namespace tidy {
@@ -28,15 +26,10 @@
///
http://clang.llvm.org/extra/clang-tidy/checks/objc-property-declaration.html
class PropertyDeclarationCheck : public ClangTidyCheck {
public:
- PropertyDeclarationCheck(StringRef Name, ClangTidyContext *Context);
+ PropertyDeclarationCheck(StringRef Name, ClangTidyContext *Context)
+ : ClangTidyCheck(Name, Context) {}
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
- void storeOptions(ClangTidyOptions::OptionMap &Options) override;
-
-private:
- const std::vector<std::string> SpecialAcronyms;
- const bool IncludeDefaultAcronyms;
- std::vector<std::string> EscapedAcronyms;
};
} // namespace objc
Index: clang-tidy/objc/PropertyDeclarationCheck.cpp
===================================================================
--- clang-tidy/objc/PropertyDeclarationCheck.cpp
+++ clang-tidy/objc/PropertyDeclarationCheck.cpp
@@ -98,14 +98,6 @@
}
} // namespace
-PropertyDeclarationCheck::PropertyDeclarationCheck(StringRef Name,
- ClangTidyContext *Context)
- : ClangTidyCheck(Name, Context),
- SpecialAcronyms(
- utils::options::parseStringList(Options.get("Acronyms", ""))),
- IncludeDefaultAcronyms(Options.get("IncludeDefaultAcronyms", true)),
- EscapedAcronyms() {}
-
void PropertyDeclarationCheck::registerMatchers(MatchFinder *Finder) {
// this check should only be applied to ObjC sources.
if (!getLangOpts().ObjC) return;
@@ -146,12 +138,6 @@
<< generateFixItHint(MatchedDecl, StandardProperty);
}
-void PropertyDeclarationCheck::storeOptions(ClangTidyOptions::OptionMap &Opts)
{
- Options.store(Opts, "Acronyms",
- utils::options::serializeStringList(SpecialAcronyms));
- Options.store(Opts, "IncludeDefaultAcronyms", IncludeDefaultAcronyms);
-}
-
} // namespace objc
} // namespace tidy
} // namespace clang
Index: docs/clang-tidy/checks/objc-property-declaration.rst
===================================================================
--- docs/clang-tidy/checks/objc-property-declaration.rst
+++ docs/clang-tidy/checks/objc-property-declaration.rst
@@ -40,15 +40,3 @@
@property(nonatomic, assign) int abc_lowerCamelCase;
The corresponding style rule: https://developer.apple.com/library/content/qa/qa1908/_index.html
-
-
-Options
--------
-
-.. option:: Acronyms
-
- This option is deprecated and ignored.
-
-.. option:: IncludeDefaultAcronyms
-
- This option is deprecated and ignored.
Index: docs/ReleaseNotes.rst
===================================================================
--- docs/ReleaseNotes.rst
+++ docs/ReleaseNotes.rst
@@ -245,6 +245,10 @@
suffix, and suggests to make the suffix uppercase. The list of destination
suffixes can be optionally provided.
+- The `Acronyms` and `IncludeDefaultAcronyms` options for the
+ :doc:`objc-property-declaration<clang-tidy/checks/objc-property-declaration>`
+ check have been removed.
+
- New alias :doc:`cert-dcl16-c
<clang-tidy/checks/cert-dcl16-c>` to :doc:`readability-uppercase-literal-suffix
<clang-tidy/checks/readability-uppercase-literal-suffix>`
Index: clang-tidy/objc/PropertyDeclarationCheck.h
===================================================================
--- clang-tidy/objc/PropertyDeclarationCheck.h
+++ clang-tidy/objc/PropertyDeclarationCheck.h
@@ -11,8 +11,6 @@
#define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_OBJC_PROPERTY_DECLARATION_H
#include "../ClangTidy.h"
-#include <string>
-#include <vector>
namespace clang {
namespace tidy {
@@ -28,15 +26,10 @@
/// http://clang.llvm.org/extra/clang-tidy/checks/objc-property-declaration.html
class PropertyDeclarationCheck : public ClangTidyCheck {
public:
- PropertyDeclarationCheck(StringRef Name, ClangTidyContext *Context);
+ PropertyDeclarationCheck(StringRef Name, ClangTidyContext *Context)
+ : ClangTidyCheck(Name, Context) {}
void registerMatchers(ast_matchers::MatchFinder *Finder) override;
void check(const ast_matchers::MatchFinder::MatchResult &Result) override;
- void storeOptions(ClangTidyOptions::OptionMap &Options) override;
-
-private:
- const std::vector<std::string> SpecialAcronyms;
- const bool IncludeDefaultAcronyms;
- std::vector<std::string> EscapedAcronyms;
};
} // namespace objc
Index: clang-tidy/objc/PropertyDeclarationCheck.cpp
===================================================================
--- clang-tidy/objc/PropertyDeclarationCheck.cpp
+++ clang-tidy/objc/PropertyDeclarationCheck.cpp
@@ -98,14 +98,6 @@
}
} // namespace
-PropertyDeclarationCheck::PropertyDeclarationCheck(StringRef Name,
- ClangTidyContext *Context)
- : ClangTidyCheck(Name, Context),
- SpecialAcronyms(
- utils::options::parseStringList(Options.get("Acronyms", ""))),
- IncludeDefaultAcronyms(Options.get("IncludeDefaultAcronyms", true)),
- EscapedAcronyms() {}
-
void PropertyDeclarationCheck::registerMatchers(MatchFinder *Finder) {
// this check should only be applied to ObjC sources.
if (!getLangOpts().ObjC) return;
@@ -146,12 +138,6 @@
<< generateFixItHint(MatchedDecl, StandardProperty);
}
-void PropertyDeclarationCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) {
- Options.store(Opts, "Acronyms",
- utils::options::serializeStringList(SpecialAcronyms));
- Options.store(Opts, "IncludeDefaultAcronyms", IncludeDefaultAcronyms);
-}
-
} // namespace objc
} // namespace tidy
} // namespace clang
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
