Skip to content

Commit 5ba0a84

Browse files
authored
chore: don't include expected.h but result.h (#69)
It is suggested that we include result.h instead of expected.h so that in the future we can simply replace this ported iceberg::expected with std::expected. Besides that, I fix some IWYU warning in this PR.
1 parent dd5fef7 commit 5ba0a84

23 files changed

+16
-28
lines changed

src/iceberg/arrow/arrow_error_transform_internal.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <arrow/result.h>
2323
#include <arrow/status.h>
2424

25-
#include "iceberg/expected.h"
2625
#include "iceberg/result.h"
2726

2827
namespace iceberg::arrow {

src/iceberg/json_internal.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,14 @@
2424

2525
#include <nlohmann/json.hpp>
2626

27-
#include "iceberg/expected.h"
2827
#include "iceberg/partition_spec.h"
2928
#include "iceberg/result.h"
3029
#include "iceberg/schema.h"
3130
#include "iceberg/schema_internal.h"
3231
#include "iceberg/sort_order.h"
3332
#include "iceberg/transform.h"
3433
#include "iceberg/type.h"
35-
#include "iceberg/util/formatter.h"
34+
#include "iceberg/util/formatter.h" // IWYU pragma: keep
3635
#include "iceberg/util/macros.h"
3736

3837
namespace iceberg {

src/iceberg/json_internal.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,9 @@
2020
#pragma once
2121

2222
#include <memory>
23-
#include <string_view>
2423

2524
#include <nlohmann/json_fwd.hpp>
2625

27-
#include "iceberg/expected.h"
2826
#include "iceberg/result.h"
2927
#include "iceberg/type_fwd.h"
3028

src/iceberg/partition_field.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "iceberg/transform.h"
2525
#include "iceberg/type.h"
26-
#include "iceberg/util/formatter.h"
26+
#include "iceberg/util/formatter.h" // IWYU pragma: keep
2727

2828
namespace iceberg {
2929

src/iceberg/partition_field.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
#include <memory>
2727
#include <string>
2828
#include <string_view>
29-
#include <vector>
3029

3130
#include "iceberg/iceberg_export.h"
3231
#include "iceberg/type_fwd.h"

src/iceberg/partition_spec.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#include "iceberg/schema.h"
2525
#include "iceberg/type.h"
26-
#include "iceberg/util/formatter.h"
26+
#include "iceberg/util/formatter.h" // IWYU pragma: keep
2727

2828
namespace iceberg {
2929

src/iceberg/schema_field.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#include <format>
2323

2424
#include "iceberg/type.h"
25-
#include "iceberg/util/formatter.h"
25+
#include "iceberg/util/formatter.h" // IWYU pragma: keep
2626

2727
namespace iceberg {
2828

src/iceberg/schema_internal.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
#include <optional>
2525
#include <string>
2626

27-
#include "iceberg/expected.h"
2827
#include "iceberg/schema.h"
2928
#include "iceberg/type.h"
3029

src/iceberg/schema_internal.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323

2424
#include <nanoarrow/nanoarrow.h>
2525

26-
#include "iceberg/expected.h"
2726
#include "iceberg/result.h"
2827
#include "iceberg/type_fwd.h"
2928

src/iceberg/sort_field.cc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
2222
#include <format>
2323

2424
#include "iceberg/transform.h"
25-
#include "iceberg/type.h"
26-
#include "iceberg/util/formatter.h"
25+
#include "iceberg/util/formatter.h" // IWYU pragma: keep
2726

2827
namespace iceberg {
2928

0 commit comments

Comments
 (0)