diff options
| -rw-r--r-- | clang-tools-extra/clang-tidy/misc/UseOverride.cpp | 4 | ||||
| -rw-r--r-- | clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp | 6 | ||||
| -rw-r--r-- | clang-tools-extra/test/clang-tidy/use-override.cpp | 28 |
3 files changed, 19 insertions, 19 deletions
diff --git a/clang-tools-extra/clang-tidy/misc/UseOverride.cpp b/clang-tools-extra/clang-tidy/misc/UseOverride.cpp index 685750eec35..bd55f894af8 100644 --- a/clang-tools-extra/clang-tidy/misc/UseOverride.cpp +++ b/clang-tools-extra/clang-tidy/misc/UseOverride.cpp @@ -74,8 +74,8 @@ void UseOverride::check(const MatchFinder::MatchResult &Result) { DiagnosticBuilder Diag = diag( Method->getLocation(), OnlyVirtualSpecified - ? "Prefer using 'override' or 'final' instead of 'virtual'" - : "Use exactly one of 'virtual', 'override' or (rarely) 'final'"); + ? "Prefer using 'override' or (rarely) 'final' instead of 'virtual'" + : "Annotate this function with 'override' or (rarely) 'final'"); CharSourceRange FileRange = Lexer::makeFileCharRange( CharSourceRange::getTokenRange(Method->getSourceRange()), Sources, diff --git a/clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp b/clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp index beaa4b09ecf..205c00274d8 100644 --- a/clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp +++ b/clang-tools-extra/test/clang-tidy/clang-tidy-diff.cpp @@ -9,10 +9,10 @@ struct A { // CHECK-NOT: warning struct B : public A { void placeholder_for_f() {} -// CHECK-SANITY: [[@LINE-1]]:8: warning: Use exactly -// CHECK: [[@LINE-2]]:8: warning: Use exactly +// CHECK-SANITY: [[@LINE-1]]:8: warning: Annotate this +// CHECK: [[@LINE-2]]:8: warning: Annotate this void g() {} -// CHECK-SANITY: [[@LINE-1]]:8: warning: Use exactly +// CHECK-SANITY: [[@LINE-1]]:8: warning: Annotate this // CHECK-NOT: warning: }; // CHECK-SANITY-NOT: Suppressed diff --git a/clang-tools-extra/test/clang-tidy/use-override.cpp b/clang-tools-extra/test/clang-tidy/use-override.cpp index 46c4500cc69..63739ad4223 100644 --- a/clang-tools-extra/test/clang-tidy/use-override.cpp +++ b/clang-tools-extra/test/clang-tidy/use-override.cpp @@ -32,11 +32,11 @@ struct Base { struct SimpleCases : public Base { public: virtual ~SimpleCases(); - // CHECK-MESSAGES: :[[@LINE-1]]:11: warning: Prefer using 'override' or 'final' instead of 'virtual' + // CHECK-MESSAGES: :[[@LINE-1]]:11: warning: Prefer using 'override' or (rarely) 'final' instead of 'virtual' // CHECK-FIXES: {{^ ~SimpleCases\(\) override;}} void a(); - // CHECK-MESSAGES: :[[@LINE-1]]:8: warning: Use exactly + // CHECK-MESSAGES: :[[@LINE-1]]:8: warning: Annotate this // CHECK-FIXES: {{^ void a\(\) override;}} void b() override; @@ -48,7 +48,7 @@ public: // CHECK-FIXES: {{^ void c\(\) override;}} virtual void d() override; - // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Use exactly + // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Annotate this // CHECK-FIXES: {{^ void d\(\) override;}} virtual void e() = 0; @@ -76,7 +76,7 @@ public: // CHECK-FIXES: {{^ bool l\(\) override MUST_USE_RESULT;}} virtual void m() override final; - // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Use exactly + // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Annotate this // CHECK-FIXES: {{^ void m\(\) final;}} }; @@ -98,7 +98,7 @@ struct DefaultedDestructor : public Base { struct FinalSpecified : public Base { public: virtual ~FinalSpecified() final; - // CHECK-MESSAGES: :[[@LINE-1]]:11: warning: Use exactly + // CHECK-MESSAGES: :[[@LINE-1]]:11: warning: Annotate this // CHECK-FIXES: {{^ ~FinalSpecified\(\) final;}} void b() final; @@ -106,19 +106,19 @@ public: // CHECK-FIXES: {{^ void b\(\) final;}} virtual void d() final; - // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Use exactly + // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Annotate this // CHECK-FIXES: {{^ void d\(\) final;}} virtual void e() final = 0; - // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Use exactly + // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Annotate this // CHECK-FIXES: {{^ void e\(\) final = 0;}} virtual void j() const final; - // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Use exactly + // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Annotate this // CHECK-FIXES: {{^ void j\(\) const final;}} virtual bool l() final MUST_USE_RESULT; - // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Use exactly + // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Annotate this // CHECK-FIXES: {{^ bool l\(\) final MUST_USE_RESULT;}} }; @@ -129,7 +129,7 @@ public: // CHECK-FIXES: {{^ ~InlineDefinitions\(\) override {}}} void a() {} - // CHECK-MESSAGES: :[[@LINE-1]]:8: warning: Use exactly + // CHECK-MESSAGES: :[[@LINE-1]]:8: warning: Annotate this // CHECK-FIXES: {{^ void a\(\) override {}}} void b() override {} @@ -141,7 +141,7 @@ public: // CHECK-FIXES: {{^ void c\(\) override {}}} virtual void d() override {} - // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Use exactly + // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Annotate this // CHECK-FIXES: {{^ void d\(\) override {}}} virtual void j() const {} @@ -161,7 +161,7 @@ struct Macros : public Base { // Tests for 'virtual' and 'override' being defined through macros. Basically // give up for now. NOT_VIRTUAL void a() NOT_OVERRIDE; - // CHECK-MESSAGES: :[[@LINE-1]]:20: warning: Use exactly + // CHECK-MESSAGES: :[[@LINE-1]]:20: warning: Annotate this // CHECK-FIXES: {{^ NOT_VIRTUAL void a\(\) override NOT_OVERRIDE;}} VIRTUAL void b() NOT_OVERRIDE; @@ -173,7 +173,7 @@ struct Macros : public Base { // CHECK-FIXES: {{^ NOT_VIRTUAL void c\(\) OVERRIDE;}} VIRTUAL void d() OVERRIDE; - // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Use exactly + // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Annotate this // CHECK-FIXES: {{^ VIRTUAL void d\(\) OVERRIDE;}} #define FUNC(return_type, name) return_type name() @@ -185,7 +185,7 @@ struct Macros : public Base { // CHECK-FIXES: {{^ F}} VIRTUAL void g() OVERRIDE final; - // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Use exactly + // CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Annotate this // CHECK-FIXES: {{^ VIRTUAL void g\(\) final;}} }; |
