diff options
4 files changed, 6 insertions, 35 deletions
diff --git a/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp b/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp index 653c6bb8694..eba702be75a 100644 --- a/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp +++ b/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.cpp @@ -97,14 +97,6 @@ bool prefixedPropertyNameValid(llvm::StringRef PropertyName) { } } // 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; @@ -145,12 +137,6 @@ void PropertyDeclarationCheck::check(const MatchFinder::MatchResult &Result) { << 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 diff --git a/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.h b/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.h index d28bde40ada..49af5df5fcd 100644 --- a/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.h +++ b/clang-tools-extra/clang-tidy/objc/PropertyDeclarationCheck.h @@ -10,8 +10,6 @@ #define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_OBJC_PROPERTY_DECLARATION_H #include "../ClangTidy.h" -#include <string> -#include <vector> namespace clang { namespace tidy { @@ -27,15 +25,10 @@ namespace objc { /// 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 diff --git a/clang-tools-extra/docs/ReleaseNotes.rst b/clang-tools-extra/docs/ReleaseNotes.rst index f932af42b0f..d92cda0bced 100644 --- a/clang-tools-extra/docs/ReleaseNotes.rst +++ b/clang-tools-extra/docs/ReleaseNotes.rst @@ -98,6 +98,10 @@ Improvements to clang-tidy `CommentUserDefiniedLiterals`, `CommentStringLiterals`, `CommentCharacterLiterals` & `CommentNullPtrs` options. +- The `Acronyms` and `IncludeDefaultAcronyms` options for the + :doc:`objc-property-declaration <clang-tidy/checks/objc-property-declaration>` + check have been removed. + Improvements to include-fixer ----------------------------- diff --git a/clang-tools-extra/docs/clang-tidy/checks/objc-property-declaration.rst b/clang-tools-extra/docs/clang-tidy/checks/objc-property-declaration.rst index 49df5102096..60b9c82e9f9 100644 --- a/clang-tools-extra/docs/clang-tidy/checks/objc-property-declaration.rst +++ b/clang-tools-extra/docs/clang-tidy/checks/objc-property-declaration.rst @@ -40,15 +40,3 @@ lowercase letters followed by a '_' to avoid naming conflict. For example: @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. |
