Merge branch 'main' into rj-perf-quir-to-pulse

openqasm · Apr 2, 2024 · 7630372 · 7630372
2 parents f564f5d + e5d0cbf
commit 7630372
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 2 deletions.
diff --git a/.clang-tidy b/.clang-tidy
@@ -63,6 +63,7 @@ WarningsAsErrors: >
   misc-*,
   -misc-no-recursion,
   -misc-unused-parameters,
+  -misc-use-anonymous-namespace,
   -misc-non-private-member-variables-in-classes,
   readability-identifier-naming,
   -llvm-header-guard,

diff --git a/lib/Dialect/QUIR/Transforms/ExtractCircuits.cpp b/lib/Dialect/QUIR/Transforms/ExtractCircuits.cpp
@@ -63,7 +63,6 @@ llvm::cl::opt<bool>
                    llvm::cl::desc("enable extract quir circuits"),
                    llvm::cl::init(false));
 
-// NOLINTNEXTLINE(misc-use-anonymous-namespace)
 static bool terminatesCircuit(Operation &op) {
   return (op.hasTrait<::mlir::RegionBranchOpInterface::Trait>() ||
           isa<qcs::ParallelControlFlowOp>(op) ||

diff --git a/tools/qss-opt/qss-opt.cpp b/tools/qss-opt/qss-opt.cpp
@@ -58,7 +58,6 @@
 using namespace qssc;
 using namespace qssc::hal;
 
-// NOLINTNEXTLINE(misc-use-anonymous-namespace)
 static const std::string toolName = "qss-opt";
 
 namespace {