Updates from clangformat

Signed-off-by: Clifford Wolf <clifford@clifford.at>

2 files changed, 16 insertions, 13 deletions

diff --git a/common/nextpnr.h b/common/nextpnr.h
index 8063a981..2d614058 100644
--- a/common/nextpnr.h
+++ b/common/nextpnr.h
@@ -291,10 +291,7 @@ struct Context : Arch
         return rngstate * 0x2545F4914F6CDD1D;
     }
 
-    int rng()
-    {
-        return rng64() & 0x3fffffff;
-    }
+    int rng() { return rng64() & 0x3fffffff; }
 
     int rng(int n)
     {
@@ -310,22 +307,25 @@ struct Context : Arch
         m += 1;
 
         while (1) {
-            int x = rng64() & (m-1);
-            if (x < n) return x;
+            int x = rng64() & (m - 1);
+            if (x < n)
+                return x;
         }
     }
 
     void rngseed(uint64_t seed)
     {
         rngstate = seed ? seed : 0x3141592653589793;
-        for (int i = 0; i < 5; i++) rng64();
+        for (int i = 0; i < 5; i++)
+            rng64();
     }
 
-    template<typename T>
-    void shuffle(std::vector<T> &a) {
+    template <typename T> void shuffle(std::vector<T> &a)
+    {
         for (size_t i = 0; i != a.size(); i++) {
             size_t j = i + rng(a.size() - i);
-            if (j > i) std::swap(a[i], a[j]);
+            if (j > i)
+                std::swap(a[i], a[j]);
         }
     }
 };
diff --git a/common/route.cc b/common/route.cc
index 04f0f4c2..d623b2cf 100644
--- a/common/route.cc
+++ b/common/route.cc
@@ -67,7 +67,8 @@ struct Router
     delay_t maxDelay = 0.0;
     WireId failedDest;
 
-    Router(Context *ctx, IdString net_name, bool ripup = false, delay_t ripup_penalty = 0)
+    Router(Context *ctx, IdString net_name, bool ripup = false,
+           delay_t ripup_penalty = 0)
     {
         auto net_info = ctx->nets.at(net_name);
 
@@ -438,7 +439,8 @@ bool route_design(Context *ctx)
             netCnt = 0;
             int ripCnt = 0;
 
-            std::vector<IdString> ripupArray(ripupQueue.begin(), ripupQueue.end());
+            std::vector<IdString> ripupArray(ripupQueue.begin(),
+                                             ripupQueue.end());
             ctx->shuffle(ripupArray);
 
             for (auto net_name : ripupArray) {
@@ -447,7 +449,8 @@ bool route_design(Context *ctx)
                              net_name.c_str(ctx),
                              int(ctx->nets.at(net_name)->users.size()));
 
-                Router router(ctx, net_name, true, ripup_penalty * (iterCnt - 1));
+                Router router(ctx, net_name, true,
+                              ripup_penalty * (iterCnt - 1));
 
                 netCnt++;
                 visitCnt += router.visitCnt;