appease the formatter

Author: Jake Champion

c-dependencies/js-compute-runtime/builtin.h

@@ -148,7 +148,9 @@ template <typename Impl> class BuiltinImpl {
       &class_ops,
   };
 
-  static inline JS::Result<std::tuple<JS::CallArgs, JS::Rooted<JSObject *> *>> MethodHeaderWithName(int required_argc, JSContext *cx, unsigned argc,JS::Value *vp, const char *name) {
+  static inline JS::Result<std::tuple<JS::CallArgs, JS::Rooted<JSObject *> *>>
+  MethodHeaderWithName(int required_argc, JSContext *cx, unsigned argc, JS::Value *vp,
+                       const char *name) {
     JS::CallArgs args = JS::CallArgsFromVp(argc, vp);
     if (!check_receiver(cx, args.thisv(), name)) {
       return JS::Result<std::tuple<JS::CallArgs, JS::Rooted<JSObject *> *>>(JS::Error());
@@ -158,7 +160,8 @@ template <typename Impl> class BuiltinImpl {
       return JS::Result<std::tuple<JS::CallArgs, JS::Rooted<JSObject *> *>>(JS::Error());
     }
 
-    return JS::Result<std::tuple<JS::CallArgs, JS::Rooted<JSObject *> *>>(std::make_tuple(args, &self));
+    return JS::Result<std::tuple<JS::CallArgs, JS::Rooted<JSObject *> *>>(
+        std::make_tuple(args, &self));
   }
 
   static JS::PersistentRooted<JSObject *> proto_obj;

c-dependencies/js-compute-runtime/builtins/worker-location.cpp

@@ -1,8 +1,8 @@
+#include "builtins/worker-location.h"
 #include "builtin.h"
 #include "builtins/url.h"
-#include "builtins/worker-location.h"
-#include "js-compute-builtins.h"
 #include "host_call.h"
+#include "js-compute-builtins.h"
 
 /**
  * The `WorkerLocation` builtin, added to the global object as the data property
@@ -12,48 +12,45 @@
 namespace builtins {
 JS::PersistentRooted<JSObject *> WorkerLocation::url;
 
-#define WorkerLocation_ACCESSOR_GET(field) \
-  bool field##_get(JSContext *cx, unsigned argc, JS::Value *vp) { \
-    auto result = WorkerLocation::MethodHeaderWithName(0, cx, argc, vp, __func__); \
-    if (result.isErr()) { \
-      return false; \
-    } \
-    auto [args, self] = result.unwrap(); \
-    REQUEST_HANDLER_ONLY("location." #field) \
-    return URL::field(cx, WorkerLocation::url, args.rval()); \
+#define WorkerLocation_ACCESSOR_GET(field)                                                         \
+  bool field##_get(JSContext *cx, unsigned argc, JS::Value *vp) {                                  \
+    auto result = WorkerLocation::MethodHeaderWithName(0, cx, argc, vp, __func__);                 \
+    if (result.isErr()) {                                                                          \
+      return false;                                                                                \
+    }                                                                                              \
+    auto [args, self] = result.unwrap();                                                           \
+    REQUEST_HANDLER_ONLY("location." #field)                                                       \
+    return URL::field(cx, WorkerLocation::url, args.rval());                                       \
   }
 
-WorkerLocation_ACCESSOR_GET(href)
-WorkerLocation_ACCESSOR_GET(origin)
-WorkerLocation_ACCESSOR_GET(protocol)
-WorkerLocation_ACCESSOR_GET(host)
-WorkerLocation_ACCESSOR_GET(hostname)
-WorkerLocation_ACCESSOR_GET(port)
-WorkerLocation_ACCESSOR_GET(pathname)
-WorkerLocation_ACCESSOR_GET(search)
-WorkerLocation_ACCESSOR_GET(hash)
+WorkerLocation_ACCESSOR_GET(href) WorkerLocation_ACCESSOR_GET(origin)
+    WorkerLocation_ACCESSOR_GET(protocol) WorkerLocation_ACCESSOR_GET(host)
+        WorkerLocation_ACCESSOR_GET(hostname) WorkerLocation_ACCESSOR_GET(port)
+            WorkerLocation_ACCESSOR_GET(pathname) WorkerLocation_ACCESSOR_GET(search)
+                WorkerLocation_ACCESSOR_GET(hash)
 
 #undef WorkerLocation_ACCESSOR_GET
 
-bool WorkerLocation::toString(JSContext *cx, unsigned argc, JS::Value *vp) {
+                    bool WorkerLocation::toString(JSContext *cx, unsigned argc, JS::Value *vp) {
   METHOD_HEADER(0)
   return href_get(cx, argc, vp);
 }
 
+const JSFunctionSpec WorkerLocation::methods[] = {JS_FN("toString", toString, 0, JSPROP_ENUMERATE),
+                                                  JS_FS_END};
 
-const JSFunctionSpec WorkerLocation::methods[] = {JS_FN("toString", toString, 0, JSPROP_ENUMERATE), JS_FS_END};
-
-const JSPropertySpec WorkerLocation::properties[] = {JS_PSG("href", href_get, JSPROP_ENUMERATE),
-                                     JS_PSG("origin", origin_get, JSPROP_ENUMERATE),
-                                     JS_PSG("protocol", protocol_get, JSPROP_ENUMERATE),
-                                     JS_PSG("host", host_get, JSPROP_ENUMERATE),
-                                     JS_PSG("hostname", hostname_get, JSPROP_ENUMERATE),
-                                     JS_PSG("port", port_get, JSPROP_ENUMERATE),
-                                     JS_PSG("pathname", pathname_get, JSPROP_ENUMERATE),
-                                     JS_PSG("search", search_get, JSPROP_ENUMERATE),
-                                     JS_PSG("hash", hash_get, JSPROP_ENUMERATE),
-                                     JS_STRING_SYM_PS(toStringTag, "Location", JSPROP_READONLY),
-                                     JS_PS_END};
+const JSPropertySpec WorkerLocation::properties[] = {
+    JS_PSG("href", href_get, JSPROP_ENUMERATE),
+    JS_PSG("origin", origin_get, JSPROP_ENUMERATE),
+    JS_PSG("protocol", protocol_get, JSPROP_ENUMERATE),
+    JS_PSG("host", host_get, JSPROP_ENUMERATE),
+    JS_PSG("hostname", hostname_get, JSPROP_ENUMERATE),
+    JS_PSG("port", port_get, JSPROP_ENUMERATE),
+    JS_PSG("pathname", pathname_get, JSPROP_ENUMERATE),
+    JS_PSG("search", search_get, JSPROP_ENUMERATE),
+    JS_PSG("hash", hash_get, JSPROP_ENUMERATE),
+    JS_STRING_SYM_PS(toStringTag, "Location", JSPROP_READONLY),
+    JS_PS_END};
 
 bool WorkerLocation::constructor(JSContext *cx, unsigned argc, JS::Value *vp) {
   JS_ReportErrorLatin1(cx, "Illegal constructor WorkerLocation");
@@ -76,4 +73,3 @@ bool WorkerLocation::init_class(JSContext *cx, JS::HandleObject global) {
 }
 
 } // namespace builtins
-

c-dependencies/js-compute-runtime/builtins/worker-location.h

@@ -7,7 +7,6 @@ namespace builtins {
 
 class WorkerLocation : public BuiltinImpl<WorkerLocation> {
 private:
-
 public:
   static constexpr const char *class_name = "WorkerLocation";
   static const int ctor_length = 1;

c-dependencies/js-compute-runtime/js-compute-builtins.cpp

@@ -3370,7 +3370,8 @@ static bool init_downstream_request(JSContext *cx, HandleObject request) {
     if (!url_instance)
       return false;
 
-    builtins::Fastly::baseURL = URL::create(cx, url_instance, URL::origin(cx, builtins::WorkerLocation::url));
+    builtins::Fastly::baseURL =
+        URL::create(cx, url_instance, URL::origin(cx, builtins::WorkerLocation::url));
     if (!builtins::Fastly::baseURL)
       return false;
   }