Merge pull request #1466 from cloudflare/jsnell/more-api-header-cleanups

cloudflare · Dec 4, 2023 · a133abb · a133abb
2 parents ce6dfa3 + 2d11e67
commit a133abb
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 25 deletions.
diff --git a/src/workerd/api/form-data.c++ b/src/workerd/api/form-data.c++
@@ -6,12 +6,11 @@
 #include "util.h"
 #include <kj/vector.h>
 #include <kj/encoding.h>
-#include <algorithm>
-#include <functional>
-#include <regex>
 #include <kj/parse/char.h>
 #include <kj/compat/http.h>
 #include <workerd/util/mimetype.h>
+#include <algorithm>
+#include <regex>
 
 #if !_MSC_VER
 #include <strings.h>

diff --git a/src/workerd/api/form-data.h b/src/workerd/api/form-data.h
@@ -4,18 +4,13 @@
 
 #pragma once
 
+#include "blob.h"
 #include <kj/vector.h>
-#include <kj/compat/url.h>
 #include <workerd/jsg/jsg.h>
-#include "blob.h"
 #include <workerd/io/compatibility-date.capnp.h>
 
 namespace workerd::api {
 
-namespace url {
-class URLSearchParams;
-}  // namespace url
-
 // Implements the FormData interface as prescribed by:
 // https://xhr.spec.whatwg.org/#interface-formdata
 //
@@ -168,8 +163,6 @@ class FormData: public jsg::Object {
       KJ_UNREACHABLE;
     }
   }
-
-  friend class url::URLSearchParams;
 };
 
 #define EW_FORMDATA_ISOLATE_TYPES     \

diff --git a/src/workerd/api/hyperdrive.c++ b/src/workerd/api/hyperdrive.c++
@@ -3,14 +3,12 @@
 //     https://opensource.org/licenses/Apache-2.0
 
 #include "hyperdrive.h"
+#include "sockets.h"
+#include "http.h"
 #include <openssl/rand.h>
-#include <cstdint>
 #include <kj/compat/http.h>
 #include <kj/encoding.h>
-#include "sockets.h"
-#include "global-scope.h"
 #include <kj/string.h>
-#include <workerd/util/uuid.h>
 
 namespace workerd::api {
 Hyperdrive::Hyperdrive(uint clientIndex, kj::String database,

diff --git a/src/workerd/api/hyperdrive.h b/src/workerd/api/hyperdrive.h
@@ -4,16 +4,13 @@
 
 #pragma once
 
-#include "streams.h"
-#include <capnp/compat/json.h>
-#include <cstdint>
-#include <kj/common.h>
-#include <kj/async-io.h>
 #include <workerd/jsg/jsg.h>
-#include <workerd/util/http-util.h>
+#include <kj/async-io.h>
 
 namespace workerd::api {
 
+class Socket;
+
 // A Hyperdrive resource for development integrations.
 //
 // Provides the same interface as Hyperdrive while sending connection
@@ -35,7 +32,7 @@ class Hyperdrive : public jsg::Object {
 
   kj::String getConnectionString();
 
-  JSG_RESOURCE_TYPE(Hyperdrive, CompatibilityFlags::Reader flags) {
+  JSG_RESOURCE_TYPE(Hyperdrive) {
     JSG_LAZY_READONLY_INSTANCE_PROPERTY(database, getDatabase);
     JSG_LAZY_READONLY_INSTANCE_PROPERTY(user, getUser);
     JSG_LAZY_READONLY_INSTANCE_PROPERTY(password, getPassword);

diff --git a/src/workerd/api/queue.h b/src/workerd/api/queue.h
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <atomic>
-
 #include <kj/async.h>
 #include <kj/common.h>
 

diff --git a/src/workerd/api/rtti.h b/src/workerd/api/rtti.h
@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <initializer_list>
 #include <kj/array.h>
 #include <kj/string.h>
 #include <workerd/io/compatibility-date.h>