Clean up a few more files

Author: localspook

clang-tools-extra/test/clang-tidy/checkers/readability/Inputs/duplicate-include/duplicate-include.h

@@ -7,9 +7,9 @@ extern int h;
 #include "duplicate-include2.h"
 extern int i;
 // CHECK-MESSAGES: :[[@LINE-2]]:1: warning: duplicate include
-// CHECK-FIXES:      {{^extern int g;$}}
-// CHECK-FIXES-NEXT: {{^#include "duplicate-include2.h"$}}
-// CHECK-FIXES-NEXT: {{^extern int h;$}}
-// CHECK-FIXES-NEXT: {{^extern int i;$}}
+// CHECK-FIXES:      extern int g;
+// CHECK-FIXES-NEXT: #include "duplicate-include2.h"
+// CHECK-FIXES-NEXT: extern int h;
+// CHECK-FIXES-NEXT: extern int i;
 
 #endif

clang-tools-extra/test/clang-tidy/checkers/readability/duplicate-include.cpp

@@ -6,32 +6,32 @@ int b;
 #include <string.h>
 int c;
 // CHECK-MESSAGES: :[[@LINE-2]]:1: warning: duplicate include [readability-duplicate-include]
-// CHECK-FIXES:      {{^int a;$}}
-// CHECK-FIXES-NEXT: {{^#include <string.h>$}}
-// CHECK-FIXES-NEXT: {{^int b;$}}
-// CHECK-FIXES-NEXT: {{^int c;$}}
+// CHECK-FIXES:      int a;
+// CHECK-FIXES-NEXT: #include <string.h>
+// CHECK-FIXES-NEXT: int b;
+// CHECK-FIXES-NEXT: int c;
 
 int d;
 #include <iostream>
 int e;
 #include <iostream> // extra stuff that will also be removed
 int f;
 // CHECK-MESSAGES: :[[@LINE-2]]:1: warning: duplicate include
-// CHECK-FIXES:      {{^int d;$}}
-// CHECK-FIXES-NEXT: {{^#include <iostream>$}}
-// CHECK-FIXES-NEXT: {{^int e;$}}
-// CHECK-FIXES-NEXT: {{^int f;$}}
+// CHECK-FIXES:      int d;
+// CHECK-FIXES-NEXT: #include <iostream>
+// CHECK-FIXES-NEXT: int e;
+// CHECK-FIXES-NEXT: int f;
 
 int g;
 #include "duplicate-include.h"
 int h;
 #include "duplicate-include.h"
 int i;
 // CHECK-MESSAGES: :[[@LINE-2]]:1: warning: duplicate include
-// CHECK-FIXES:      {{^int g;$}}
-// CHECK-FIXES-NEXT: {{^#include "duplicate-include.h"$}}
-// CHECK-FIXES-NEXT: {{^int h;$}}
-// CHECK-FIXES-NEXT: {{^int i;$}}
+// CHECK-FIXES:      int g;
+// CHECK-FIXES-NEXT: #include "duplicate-include.h"
+// CHECK-FIXES-NEXT: int h;
+// CHECK-FIXES-NEXT: int i;
 
 #include <types.h>
 
@@ -41,35 +41,35 @@ int k;
 #include <sys/types.h>
 int l;
 // CHECK-MESSAGES: :[[@LINE-2]]:1: warning: duplicate include
-// CHECK-FIXES:      {{^int j;$}}
-// CHECK-FIXES-NEXT: {{^#include <sys/types.h>$}}
-// CHECK-FIXES-NEXT: {{^int k;$}}
-// CHECK-FIXES-NEXT: {{^int l;$}}
+// CHECK-FIXES:      int j;
+// CHECK-FIXES-NEXT: #include <sys/types.h>
+// CHECK-FIXES-NEXT: int k;
+// CHECK-FIXES-NEXT: int l;
 
 int m;
         #          include             <string.h>  // lots of space
 int n;
 // CHECK-MESSAGES: :[[@LINE-2]]:9: warning: duplicate include
-// CHECK-FIXES:      {{^int m;$}}
-// CHECK-FIXES-NEXT: {{^int n;$}}
+// CHECK-FIXES:      int m;
+// CHECK-FIXES-NEXT: int n;
 
 // defining a macro in the main file resets the included file cache
 #define ARBITRARY_MACRO
 int o;
 #include <sys/types.h>
 int p;
-// CHECK-FIXES:      {{^int o;$}}
-// CHECK-FIXES-NEXT: {{^#include <sys/types.h>$}}
-// CHECK-FIXES-NEXT: {{^int p;$}}
+// CHECK-FIXES:      int o;
+// CHECK-FIXES-NEXT: #include <sys/types.h>
+// CHECK-FIXES-NEXT: int p;
 
 // undefining a macro resets the cache
 #undef ARBITRARY_MACRO
 int q;
 #include <sys/types.h>
 int r;
-// CHECK-FIXES:      {{^int q;$}}
-// CHECK-FIXES-NEXT: {{^#include <sys/types.h>$}}
-// CHECK-FIXES-NEXT: {{^int r;$}}
+// CHECK-FIXES:      int q;
+// CHECK-FIXES-NEXT: #include <sys/types.h>
+// CHECK-FIXES-NEXT: int r;
 
 namespace Issue_87303 {
 #define RESET_INCLUDE_CACHE

clang-tools-extra/test/clang-tidy/checkers/readability/identifier-naming.cpp

@@ -644,7 +644,7 @@ char const a<t_t>::MyConstClass_string[] = "123";
 
 template <template <typename> class A> struct b { A<int> c; };
 // CHECK-MESSAGES: :[[@LINE-1]]:47: warning: invalid case style for struct 'b'
-// CHECK-FIXES:template <template <typename> class A> struct B { A<int> c; };{{$}}
+// CHECK-FIXES: template <template <typename> class A> struct B { A<int> c; };
 
 unsigned MY_GLOBAL_array[] = {1,2,3};
 // CHECK-MESSAGES: :[[@LINE-1]]:10: warning: invalid case style for global variable 'MY_GLOBAL_array'