Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix some incorrect include statements. #2526

Merged
merged 1 commit into from
Aug 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/workerd/api/crypto/x509.c++
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include "impl.h"
#include "x509.h"
#include "openssl/bio.h"
#include "openssl/pem.h"
#include "openssl/x509v3.h"
#include <openssl/bio.h>
#include <openssl/pem.h>
#include <openssl/x509v3.h>

KJ_DECLARE_NON_POLYMORPHIC(STACK_OF(ASN1_OBJECT));

Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/gpu/gpu-adapter.c++
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "gpu-device.h"
#include "gpu-supported-features.h"
#include "gpu-supported-limits.h"
#include "workerd/jsg/exception.h"
#include <workerd/jsg/exception.h>

#define WGPU_FOR_EACH_LIMIT(X) \
X(maxTextureDimension1D) \
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/gpu/gpu-async-runner.c++
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// https://opensource.org/licenses/Apache-2.0

#include "gpu-async-runner.h"
#include "workerd/io/io-context.h"
#include <workerd/io/io-context.h>
#include <kj/common.h>
#include <kj/debug.h>

Expand Down
4 changes: 2 additions & 2 deletions src/workerd/api/gpu/gpu-buffer.c++
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
// https://opensource.org/licenses/Apache-2.0

#include "gpu-buffer.h"
#include "workerd/jsg/exception.h"
#include "workerd/jsg/jsg.h"
#include <workerd/jsg/exception.h>
#include <workerd/jsg/jsg.h>

namespace workerd::api::gpu {

Expand Down
4 changes: 2 additions & 2 deletions src/workerd/api/gpu/gpu-device.c++
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
#include "gpu-sampler.h"
#include "gpu-texture.h"
#include "gpu-utils.h"
#include "workerd/jsg/exception.h"
#include "workerd/jsg/jsg.h"
#include <workerd/jsg/exception.h>
#include <workerd/jsg/jsg.h>

namespace workerd::api::gpu {

Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/gpu/gpu-device.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "gpu-supported-features.h"
#include "gpu-supported-limits.h"
#include "gpu-texture.h"
#include "workerd/jsg/promise.h"
#include <workerd/jsg/promise.h>
#include <dawn/native/DawnNative.h>
#include <webgpu/webgpu_cpp.h>
#include <workerd/api/basics.h>
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/gpu/gpu-query-set.c++
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// https://opensource.org/licenses/Apache-2.0

#include "gpu-query-set.h"
#include "workerd/jsg/exception.h"
#include <workerd/jsg/exception.h>

namespace workerd::api::gpu {

Expand Down
3 changes: 2 additions & 1 deletion src/workerd/api/gpu/gpu-queue.c++
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
// https://opensource.org/licenses/Apache-2.0

#include "gpu-queue.h"
#include "workerd/jsg/exception.h"
#include <workerd/jsg/exception.h>


namespace workerd::api::gpu {

Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/gpu/gpu-texture-view.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#pragma once

#include "gpu-utils.h"
#include "workerd/jsg/iterator.h"
#include <workerd/jsg/iterator.h>
#include <webgpu/webgpu_cpp.h>
#include <workerd/jsg/buffersource.h>
#include <workerd/jsg/jsg.h>
Expand Down
8 changes: 4 additions & 4 deletions src/workerd/api/gpu/gpu-texture.c++
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
// https://opensource.org/licenses/Apache-2.0

#include "gpu-texture.h"
#include "workerd/api/gpu/gpu-texture-view.h"
#include "workerd/api/gpu/gpu-utils.h"
#include "workerd/jsg/exception.h"
#include "workerd/jsg/jsg.h"
#include <workerd/api/gpu/gpu-texture-view.h>
#include <workerd/api/gpu/gpu-utils.h>
#include <workerd/jsg/exception.h>
#include <workerd/jsg/jsg.h>

namespace workerd::api::gpu {

Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/gpu/gpu-texture.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#include "gpu-texture-view.h"
#include "gpu-utils.h"
#include "workerd/jsg/iterator.h"
#include <workerd/jsg/iterator.h>
#include <webgpu/webgpu_cpp.h>
#include <workerd/jsg/buffersource.h>
#include <workerd/jsg/jsg.h>
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/gpu/gpu.c++
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// https://opensource.org/licenses/Apache-2.0

#include "gpu.h"
#include "workerd/jsg/exception.h"
#include <workerd/jsg/exception.h>
#include <dawn/dawn_proc.h>

namespace workerd::api::gpu {
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/html-rewriter.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include "workerd/api/http.h"
#include <workerd/api/http.h>
#include <workerd/jsg/jsg.h>
#include <v8.h>

Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/node/i18n.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include <kj/one-of.h>
#include <kj/string.h>

#include <stdint.h>
#include <cstdint>

struct UConverter;

Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/node/zlib-util.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "zlib.h"

#include <limits>
#include <stdint.h>
#include <cstdint>

namespace workerd::api::node {

Expand Down
6 changes: 3 additions & 3 deletions src/workerd/api/pyodide/pyodide.c++
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#include "pyodide.h"
#include <kj/string.h>
#include <workerd/util/string-buffer.h>
#include "kj/array.h"
#include "kj/common.h"
#include "kj/debug.h"
#include <kj/array.h>
#include <kj/common.h>
#include <kj/debug.h>

namespace workerd::api::pyodide {

Expand Down
6 changes: 3 additions & 3 deletions src/workerd/api/pyodide/pyodide.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#pragma once

#include "kj/array.h"
#include "kj/debug.h"
#include <kj/array.h>
#include <kj/debug.h>
#include <kj/common.h>
#include <kj/filesystem.h>
#include <pyodide/generated/pyodide_extra.capnp.h>
Expand All @@ -12,7 +12,7 @@
#include <workerd/server/workerd.capnp.h>
#include <workerd/io/io-context.h>
#include <workerd/util/autogate.h>
#include "capnp/serialize.h"
#include <capnp/serialize.h>

namespace workerd::api::pyodide {

Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/r2-bucket.c++
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "r2-rpc.h"
#include "util.h"
#include <array>
#include <math.h>
#include <cmath>
#include <workerd/api/http.h>
#include <workerd/api/streams.h>
#include <workerd/util/mimetype.h>
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/r2-multipart.c++
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "r2-bucket.h"
#include "r2-rpc.h"
#include <array>
#include <math.h>
#include <cmath>
#include <kj/compat/http.h>
#include <capnp/message.h>
#include <capnp/compat/json.h>
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/sql.c++
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "sql.h"
#include "actor-state.h"
#include "workerd/io/io-context.h"
#include <workerd/io/io-context.h>

namespace workerd::api {

Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/url-standard.c++
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <kj/array.h>
#include <cmath>
#include <map>
#include <string.h>
#include <cstring>
#include <unicode/ustring.h>
#include <unicode/uchar.h>
#include <unicode/uidna.h>
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/api/web-socket.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "basics.h"
#include <workerd/io/io-context.h>
#include <workerd/util/weak-refs.h>
#include <stdlib.h>
#include <cstdlib>

namespace workerd {
class ActorObserver;
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/io/compatibility-date.c++
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the Apache 2.0 license found in the LICENSE file or at:
// https://opensource.org/licenses/Apache-2.0

#include <stdio.h>
#include <cstdio>
#include "compatibility-date.h"
#include "time.h"
#include <capnp/schema.h>
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/io/worker.c++
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
#include <v8-inspector.h>
#include <v8-profiler.h>
#include <map>
#include <time.h>
#include <ctime>
#include <numeric>

#if _WIN32
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/io/worker.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#pragma once
// Classes to manage lifetime of workers, scripts, and isolates.

#include "workerd/util/xthreadnotifier.h"
#include <workerd/util/xthreadnotifier.h>
#include <workerd/io/worker-interface.h>
#include <workerd/io/limit-enforcer.h>
#include <kj/compat/http.h>
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/jsg/jsg.c++
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#include "jsg.h"
#include "setup.h"
#include "workerd/jsg/util.h"
#include <workerd/jsg/util.h>
#include <workerd/util/thread-scopes.h>

namespace workerd::jsg {
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/jsg/rtti-test.c++
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the Apache 2.0 license found in the LICENSE file or at:
// https://opensource.org/licenses/Apache-2.0

#include "workerd/jsg/jsg.h"
#include <workerd/jsg/jsg.h>
#include <capnp/message.h>
#include <capnp/serialize-text.h>
#include <kj/test.h>
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/jsg/setup.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "async-context.h"
#include "type-wrapper.h"
#include "v8-platform-wrapper.h"
#include "v8-profiler.h"
#include <v8-profiler.h>
#include <workerd/util/batch-queue.h>
#include <kj/map.h>
#include <kj/mutex.h>
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/jsg/util.c++
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "setup.h"
#include "ser.h"
#include <kj/debug.h>
#include <stdlib.h>
#include <cstdlib>

#if !_WIN32
#include <cxxabi.h>
Expand Down
2 changes: 1 addition & 1 deletion src/workerd/server/server-test.c++
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <workerd/jsg/setup.h>
#include <kj/async-queue.h>
#include <regex>
#include <stdlib.h>
#include <cstdlib>

namespace workerd::server {
namespace {
Expand Down
8 changes: 4 additions & 4 deletions src/workerd/server/server.c++
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include <workerd/io/compatibility-date.h>
#include <workerd/io/io-context.h>
#include <workerd/io/worker.h>
#include <time.h>
#include <ctime>
#include <openssl/bio.h>
#include <openssl/pem.h>
#include <workerd/io/actor-cache.h>
Expand All @@ -33,9 +33,9 @@
#include <workerd/util/use-perfetto-categories.h>
#include <workerd/api/worker-rpc.h>
#include "workerd-api.h"
#include "workerd/api/pyodide/pyodide.h"
#include "workerd/io/hibernation-manager.h"
#include <stdlib.h>
#include <workerd/api/pyodide/pyodide.h>
#include <workerd/io/hibernation-manager.h>
#include <cstdlib>

namespace workerd::server {

Expand Down
2 changes: 1 addition & 1 deletion src/workerd/server/v8-platform-impl.c++
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// https://opensource.org/licenses/Apache-2.0

#include "v8-platform-impl.h"
#include "kj/time.h"
#include <kj/time.h>

namespace workerd::server {

Expand Down
2 changes: 1 addition & 1 deletion src/workerd/tests/bench-json.c++
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include <workerd/tests/bench-tools.h>
#include <workerd/api/r2-api.capnp.h>
#include <capnp/message.h>
#include "capnp/compat/json.h"
#include <capnp/compat/json.h>
#include <kj/string.h>
#include <kj/test.h>

Expand Down
2 changes: 1 addition & 1 deletion src/workerd/util/autogate.c++
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <workerd/util/sentry.h>
#include <capnp/message.h>
#include <kj/common.h>
#include "kj/debug.h"
#include <kj/debug.h>

namespace workerd::util {

Expand Down
2 changes: 1 addition & 1 deletion src/workerd/util/autogate.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
// https://opensource.org/licenses/Apache-2.0
#pragma once

#include "kj/string.h"
#include <kj/string.h>
#include <capnp/blob.h>
#include <capnp/list.h>
#include <initializer_list>
Expand Down
4 changes: 2 additions & 2 deletions src/workerd/util/color-util.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

#pragma once

#include <stdlib.h>
#include <cstdlib>
#include <kj/string.h>

namespace workerd {
Expand Down Expand Up @@ -34,4 +34,4 @@ static ColorMode permitsColor() {
}
}

}
} // namespace workerd
2 changes: 1 addition & 1 deletion src/workerd/util/sentry.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <kj/string.h>
#include <kj/exception.h>
#include <kj/time.h>
#include <stdint.h>
#include <cstdint>

namespace workerd {

Expand Down
4 changes: 2 additions & 2 deletions src/workerd/util/sqlite-test.c++
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <cstdint>
#include <kj/test.h>
#include <kj/thread.h>
#include <stdlib.h>
#include <errno.h>
#include <cstdlib>
#include <cerrno>
#include <fcntl.h>
#include <atomic>

Expand Down
2 changes: 1 addition & 1 deletion src/workerd/util/string-buffer-test.c++
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Licensed under the Apache 2.0 license found in the LICENSE file or at:
// https://opensource.org/licenses/Apache-2.0

#include "workerd/util/string-buffer.h"
#include "string-buffer.h"
#include <kj/test.h>

namespace workerd {
Expand Down
Loading
Loading