From d66f3ded8f7b22b792edf9ac168d89ee02b2533d Mon Sep 17 00:00:00 2001
From: Alec Edgington <alec.edgington@quantinuum.com>
Date: Fri, 3 May 2024 12:53:50 +0100
Subject: [PATCH 1/3] Show diff from clang-format.

---
 .github/workflows/build_and_test.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index a8a738ef5b..c4ff3ef09f 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -88,7 +88,8 @@ jobs:
         run: |
           brew update
           brew install clang-format@18
-          git ls-files "*.cpp" "*.hpp" | xargs clang-format -style=file --dry-run --Werror
+          git ls-files "*.cpp" "*.hpp" | xargs clang-format -style=file -i
+          git diff --exit-code
 
   build_test_tket:
     name: Build and test (tket)

From 5ea5eaf83a64e60e449de0b3a6b51e223c9108ea Mon Sep 17 00:00:00 2001
From: Alec Edgington <alec.edgington@quantinuum.com>
Date: Fri, 3 May 2024 12:58:19 +0100
Subject: [PATCH 2/3] Fix formatting.

---
 libs/tklog/src/TketLog.cpp                          | 4 ++--
 tket/src/Architecture/DistancesFromArchitecture.cpp | 4 ++--
 tket/src/Clifford/UnitaryTableau.cpp                | 8 ++++----
 tket/src/Predicates/Predicates.cpp                  | 3 +--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/libs/tklog/src/TketLog.cpp b/libs/tklog/src/TketLog.cpp
index 4d8cbe2444..7dc53059b0 100644
--- a/libs/tklog/src/TketLog.cpp
+++ b/libs/tklog/src/TketLog.cpp
@@ -63,8 +63,8 @@ void Logger::log(const char *levstr, const std::string &s, std::ostream &os) {
 #else
   plt = std::localtime(&t);
 #endif
-  os << "[" << std::put_time(plt, "%Y-%m-%d %H:%M:%S") << "]" << " [tket] ["
-     << levstr << "] " << s << std::endl;
+  os << "[" << std::put_time(plt, "%Y-%m-%d %H:%M:%S") << "]"
+     << " [tket] [" << levstr << "] " << s << std::endl;
 }
 
 void Logger::set_level(LogLevel lev) { level = lev; }
diff --git a/tket/src/Architecture/DistancesFromArchitecture.cpp b/tket/src/Architecture/DistancesFromArchitecture.cpp
index 412c777356..5c17a7917c 100644
--- a/tket/src/Architecture/DistancesFromArchitecture.cpp
+++ b/tket/src/Architecture/DistancesFromArchitecture.cpp
@@ -80,8 +80,8 @@ std::size_t DistancesFromArchitecture::operator()(
         distance_entry > 0 ||
         AssertMessage() << "DistancesFromArchitecture: architecture has "
                         << arch.n_nodes() << " vertices, "
-                        << arch.n_connections() << " edges; " << " and d("
-                        << vertex1 << "," << vertex2
+                        << arch.n_connections() << " edges; "
+                        << " and d(" << vertex1 << "," << vertex2
                         << ")=0. "
                            "Is the graph connected?");
     // GCOVR_EXCL_STOP
diff --git a/tket/src/Clifford/UnitaryTableau.cpp b/tket/src/Clifford/UnitaryTableau.cpp
index e73a1d1203..50a5dcc76c 100644
--- a/tket/src/Clifford/UnitaryTableau.cpp
+++ b/tket/src/Clifford/UnitaryTableau.cpp
@@ -715,16 +715,16 @@ std::ostream& operator<<(std::ostream& os, const UnitaryRevTableau& tab) {
   for (unsigned i = 0; i < nqs; ++i) {
     Qubit qi = tab.tab_.qubits_.right.at(i);
     os << tab.tab_.tab_.xmat.row(i) << "   " << tab.tab_.tab_.zmat.row(i)
-       << "   " << tab.tab_.tab_.phase(i) << "\t->\t" << "X@" << qi.repr()
-       << std::endl;
+       << "   " << tab.tab_.tab_.phase(i) << "\t->\t"
+       << "X@" << qi.repr() << std::endl;
   }
   os << "--" << std::endl;
   for (unsigned i = 0; i < nqs; ++i) {
     Qubit qi = tab.tab_.qubits_.right.at(i);
     os << tab.tab_.tab_.xmat.row(i + nqs) << "   "
        << tab.tab_.tab_.zmat.row(i + nqs) << "   "
-       << tab.tab_.tab_.phase(i + nqs) << "\t->\t" << "Z@" << qi.repr()
-       << std::endl;
+       << tab.tab_.tab_.phase(i + nqs) << "\t->\t"
+       << "Z@" << qi.repr() << std::endl;
   }
   return os;
 }
diff --git a/tket/src/Predicates/Predicates.cpp b/tket/src/Predicates/Predicates.cpp
index eaa5f2cd82..e5a6207921 100644
--- a/tket/src/Predicates/Predicates.cpp
+++ b/tket/src/Predicates/Predicates.cpp
@@ -52,8 +52,7 @@ static std::string auto_name(const T&) {
   return predicate_name(typeid(T));
 }
 
-#define SET_PRED_NAME(a) \
-  { typeid(a), #a }
+#define SET_PRED_NAME(a) {typeid(a), #a}
 
 const std::string& predicate_name(std::type_index idx) {
   static const std::map<std::type_index, std::string> predicate_names = {

From 9be3b7eef016c8701febde77f86409ce148a07e4 Mon Sep 17 00:00:00 2001
From: Alec Edgington <alec.edgington@quantinuum.com>
Date: Fri, 3 May 2024 13:07:16 +0100
Subject: [PATCH 3/3] Bump tket version.

---
 pytket/conanfile.py | 2 +-
 tket/conanfile.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pytket/conanfile.py b/pytket/conanfile.py
index 53331101db..8eff94e165 100644
--- a/pytket/conanfile.py
+++ b/pytket/conanfile.py
@@ -32,7 +32,7 @@ def package(self):
         cmake.install()
 
     def requirements(self):
-        self.requires("tket/1.2.119@tket/stable")
+        self.requires("tket/1.2.120@tket/stable")
         self.requires("tklog/0.3.3@tket/stable")
         self.requires("tkrng/0.3.3@tket/stable")
         self.requires("tkassert/0.3.4@tket/stable")
diff --git a/tket/conanfile.py b/tket/conanfile.py
index aa82ae4190..1e948b370d 100644
--- a/tket/conanfile.py
+++ b/tket/conanfile.py
@@ -23,7 +23,7 @@
 
 class TketConan(ConanFile):
     name = "tket"
-    version = "1.2.119"
+    version = "1.2.120"
     package_type = "library"
     license = "Apache 2"
     homepage = "https://github.com/CQCL/tket"