From e8809e9f866d67379c37ea9fee097cd6b9a0f146 Mon Sep 17 00:00:00 2001
From: Robert Schulze <robert@clickhouse.com>
Date: Sun, 8 May 2022 08:36:05 +0200
Subject: [PATCH] Revert "Complain about std::make_pair/tuple (check-style)"

This reverts commit 3a4da941269ac5e8b71da33f23fd56dc2d46a301.
---
 src/Interpreters/AsynchronousInsertQueue.h | 2 +-
 utils/check-style/check-style              | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Interpreters/AsynchronousInsertQueue.h b/src/Interpreters/AsynchronousInsertQueue.h
index 6379f9a3e43..db3cb3049fd 100644
--- a/src/Interpreters/AsynchronousInsertQueue.h
+++ b/src/Interpreters/AsynchronousInsertQueue.h
@@ -141,7 +141,7 @@ public:
     auto getQueueLocked() const
     {
         std::shared_lock lock(rwlock);
-        return std::make_pair(std::ref(queue), std::move(lock)); // NOLINT(style-check-make-pair-tuple)
+        return std::make_pair(std::ref(queue), std::move(lock));
     }
 };
 
diff --git a/utils/check-style/check-style b/utils/check-style/check-style
index 6b84ccac7af..84ce7ae5742 100755
--- a/utils/check-style/check-style
+++ b/utils/check-style/check-style
@@ -228,9 +228,6 @@ find $ROOT_PATH -name '.gitmodules' | while read i; do grep -F 'url = ' $i | gre
 # There shouldn't be any code snippets under GPL or LGPL
 find $ROOT_PATH/{src,base,programs} -name '*.h' -or -name '*.cpp' 2>/dev/null | xargs grep -i -F 'General Public License' && echo "There shouldn't be any code snippets under GPL or LGPL"
 
-# std::make_tuple/pair was superseded by std::pair/tuple, use "// NOLINT(style-check-make-pair-tuple)" to suppress the check
-find $ROOT_PATH/{src,base,programs} -name '*.h' -or -name '*.cpp' 2>/dev/null | xargs grep -P 'std::make_(pair|tuple).*(?<!NOLINT\(style-check-make-pair-tuple\))$' && echo "std::make_pair/make_tuple should be replaced by std::pair/tuple"
-
 # There shouldn't be any docker containers outside docker directory
 find $ROOT_PATH -not -path $ROOT_PATH'/tests/ci*' -not -path $ROOT_PATH'/docker*' -not -path $ROOT_PATH'/contrib*' -name Dockerfile -type f 2>/dev/null | xargs --no-run-if-empty -n1 echo "Please move Dockerfile to docker directory:"