Skip to content

Commit fecc802

Browse files
peterepetere
committed
IWYU pragmas for catalog headers
Add "IWYU pragma: export" annotations in each catalog header file so that, for instance, including "catalog/pg_aggregate.h" is considered acceptable in place of "catalog/pg_aggregate_d.h". This is very common and it seems better to silence IWYU about it than trying to fix this up. Discussion: https://www.postgresql.org/message-id/flat/9395d484-eff4-47c2-b276-8e228526c8ae@eisentraut.org
1 parent 74938d1 commit fecc802

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+63
-63
lines changed

‎src/include/catalog/pg_aggregate.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_AGGREGATE_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_aggregate_d.h"
22+
#include "catalog/pg_aggregate_d.h" /* IWYU pragma: export */
2323

2424
#include "catalog/objectaddress.h"
2525
#include "nodes/pg_list.h"

‎src/include/catalog/pg_am.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_AM_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_am_d.h"
22+
#include "catalog/pg_am_d.h" /* IWYU pragma: export */
2323

2424
/* ----------------
2525
* pg_am definition. cpp turns this into

‎src/include/catalog/pg_amop.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#define PG_AMOP_H
4545

4646
#include "catalog/genbki.h"
47-
#include "catalog/pg_amop_d.h"
47+
#include "catalog/pg_amop_d.h" /* IWYU pragma: export */
4848

4949
/* ----------------
5050
* pg_amop definition. cpp turns this into

‎src/include/catalog/pg_amproc.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#define PG_AMPROC_H
3434

3535
#include "catalog/genbki.h"
36-
#include "catalog/pg_amproc_d.h"
36+
#include "catalog/pg_amproc_d.h" /* IWYU pragma: export */
3737

3838
/* ----------------
3939
* pg_amproc definition. cpp turns this into

‎src/include/catalog/pg_attrdef.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "catalog/genbki.h"
2222
#include "catalog/objectaddress.h"
23-
#include "catalog/pg_attrdef_d.h"
23+
#include "catalog/pg_attrdef_d.h" /* IWYU pragma: export */
2424

2525
/* ----------------
2626
* pg_attrdef definition. cpp turns this into

‎src/include/catalog/pg_attribute.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#define PG_ATTRIBUTE_H
2424

2525
#include "catalog/genbki.h"
26-
#include "catalog/pg_attribute_d.h"
26+
#include "catalog/pg_attribute_d.h" /* IWYU pragma: export */
2727

2828
/* ----------------
2929
* pg_attribute definition. cpp turns this into

‎src/include/catalog/pg_auth_members.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define PG_AUTH_MEMBERS_H
2121

2222
#include "catalog/genbki.h"
23-
#include "catalog/pg_auth_members_d.h"
23+
#include "catalog/pg_auth_members_d.h" /* IWYU pragma: export */
2424

2525
/* ----------------
2626
* pg_auth_members definition. cpp turns this into

‎src/include/catalog/pg_authid.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#define PG_AUTHID_H
2222

2323
#include "catalog/genbki.h"
24-
#include "catalog/pg_authid_d.h"
24+
#include "catalog/pg_authid_d.h" /* IWYU pragma: export */
2525

2626
/* ----------------
2727
* pg_authid definition. cpp turns this into

‎src/include/catalog/pg_cast.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
#include "catalog/dependency.h"
2424
#include "catalog/genbki.h"
25-
#include "catalog/pg_cast_d.h"
25+
#include "catalog/pg_cast_d.h" /* IWYU pragma: export */
2626

2727
/* ----------------
2828
* pg_cast definition. cpp turns this into

‎src/include/catalog/pg_class.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_CLASS_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_class_d.h"
22+
#include "catalog/pg_class_d.h" /* IWYU pragma: export */
2323

2424
/* ----------------
2525
* pg_class definition. cpp turns this into

‎src/include/catalog/pg_collation.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_COLLATION_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_collation_d.h"
22+
#include "catalog/pg_collation_d.h" /* IWYU pragma: export */
2323

2424
/* ----------------
2525
* pg_collation definition. cpp turns this into

‎src/include/catalog/pg_constraint.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "catalog/dependency.h"
2222
#include "catalog/genbki.h"
23-
#include "catalog/pg_constraint_d.h"
23+
#include "catalog/pg_constraint_d.h" /* IWYU pragma: export */
2424
#include "nodes/pg_list.h"
2525

2626
/* ----------------

‎src/include/catalog/pg_conversion.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include "catalog/genbki.h"
2121
#include "catalog/objectaddress.h"
22-
#include "catalog/pg_conversion_d.h"
22+
#include "catalog/pg_conversion_d.h" /* IWYU pragma: export */
2323

2424
/* ----------------
2525
* pg_conversion definition. cpp turns this into

‎src/include/catalog/pg_database.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_DATABASE_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_database_d.h"
22+
#include "catalog/pg_database_d.h" /* IWYU pragma: export */
2323

2424
/* ----------------
2525
* pg_database definition. cpp turns this into

‎src/include/catalog/pg_db_role_setting.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define PG_DB_ROLE_SETTING_H
2121

2222
#include "catalog/genbki.h"
23-
#include "catalog/pg_db_role_setting_d.h"
23+
#include "catalog/pg_db_role_setting_d.h" /* IWYU pragma: export */
2424

2525
#include "utils/guc.h"
2626
#include "utils/relcache.h"

‎src/include/catalog/pg_default_acl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define PG_DEFAULT_ACL_H
2121

2222
#include "catalog/genbki.h"
23-
#include "catalog/pg_default_acl_d.h"
23+
#include "catalog/pg_default_acl_d.h" /* IWYU pragma: export */
2424

2525
/* ----------------
2626
* pg_default_acl definition. cpp turns this into

‎src/include/catalog/pg_depend.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#define PG_DEPEND_H
3333

3434
#include "catalog/genbki.h"
35-
#include "catalog/pg_depend_d.h"
35+
#include "catalog/pg_depend_d.h" /* IWYU pragma: export */
3636

3737
/* ----------------
3838
* pg_depend definition. cpp turns this into

‎src/include/catalog/pg_description.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#define PG_DESCRIPTION_H
3939

4040
#include "catalog/genbki.h"
41-
#include "catalog/pg_description_d.h"
41+
#include "catalog/pg_description_d.h" /* IWYU pragma: export */
4242

4343
/* ----------------
4444
* pg_description definition. cpp turns this into

‎src/include/catalog/pg_enum.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_ENUM_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_enum_d.h"
22+
#include "catalog/pg_enum_d.h" /* IWYU pragma: export */
2323

2424
#include "nodes/pg_list.h"
2525

‎src/include/catalog/pg_event_trigger.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_EVENT_TRIGGER_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_event_trigger_d.h"
22+
#include "catalog/pg_event_trigger_d.h" /* IWYU pragma: export */
2323

2424
/* ----------------
2525
* pg_event_trigger definition. cpp turns this into

‎src/include/catalog/pg_extension.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_EXTENSION_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_extension_d.h"
22+
#include "catalog/pg_extension_d.h" /* IWYU pragma: export */
2323

2424
/* ----------------
2525
* pg_extension definition. cpp turns this into

‎src/include/catalog/pg_foreign_data_wrapper.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_FOREIGN_DATA_WRAPPER_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_foreign_data_wrapper_d.h"
22+
#include "catalog/pg_foreign_data_wrapper_d.h" /* IWYU pragma: export */
2323

2424
/* ----------------
2525
* pg_foreign_data_wrapper definition. cpp turns this into

‎src/include/catalog/pg_foreign_server.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#define PG_FOREIGN_SERVER_H
1919

2020
#include "catalog/genbki.h"
21-
#include "catalog/pg_foreign_server_d.h"
21+
#include "catalog/pg_foreign_server_d.h" /* IWYU pragma: export */
2222

2323
/* ----------------
2424
* pg_foreign_server definition. cpp turns this into

‎src/include/catalog/pg_foreign_table.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
#define PG_FOREIGN_TABLE_H
1919

2020
#include "catalog/genbki.h"
21-
#include "catalog/pg_foreign_table_d.h"
21+
#include "catalog/pg_foreign_table_d.h" /* IWYU pragma: export */
2222

2323
/* ----------------
2424
* pg_foreign_table definition. cpp turns this into

‎src/include/catalog/pg_index.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_INDEX_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_index_d.h"
22+
#include "catalog/pg_index_d.h" /* IWYU pragma: export */
2323

2424
/* ----------------
2525
* pg_index definition. cpp turns this into

‎src/include/catalog/pg_inherits.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_INHERITS_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_inherits_d.h"
22+
#include "catalog/pg_inherits_d.h" /* IWYU pragma: export */
2323

2424
#include "nodes/pg_list.h"
2525
#include "storage/lock.h"

‎src/include/catalog/pg_init_privs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#define PG_INIT_PRIVS_H
3737

3838
#include "catalog/genbki.h"
39-
#include "catalog/pg_init_privs_d.h"
39+
#include "catalog/pg_init_privs_d.h" /* IWYU pragma: export */
4040

4141
/* ----------------
4242
* pg_init_privs definition. cpp turns this into

‎src/include/catalog/pg_language.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_LANGUAGE_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_language_d.h"
22+
#include "catalog/pg_language_d.h" /* IWYU pragma: export */
2323

2424
/* ----------------
2525
* pg_language definition. cpp turns this into

‎src/include/catalog/pg_largeobject.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_LARGEOBJECT_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_largeobject_d.h"
22+
#include "catalog/pg_largeobject_d.h" /* IWYU pragma: export */
2323
#include "utils/snapshot.h"
2424

2525
/* ----------------

‎src/include/catalog/pg_largeobject_metadata.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define PG_LARGEOBJECT_METADATA_H
2121

2222
#include "catalog/genbki.h"
23-
#include "catalog/pg_largeobject_metadata_d.h"
23+
#include "catalog/pg_largeobject_metadata_d.h" /* IWYU pragma: export */
2424

2525
/* ----------------
2626
* pg_largeobject_metadata definition. cpp turns this into

‎src/include/catalog/pg_namespace.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_NAMESPACE_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_namespace_d.h"
22+
#include "catalog/pg_namespace_d.h" /* IWYU pragma: export */
2323
#include "utils/acl.h"
2424

2525
/* ----------------------------------------------------------------

‎src/include/catalog/pg_opclass.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
#define PG_OPCLASS_H
4040

4141
#include "catalog/genbki.h"
42-
#include "catalog/pg_opclass_d.h"
42+
#include "catalog/pg_opclass_d.h" /* IWYU pragma: export */
4343

4444
/* ----------------
4545
* pg_opclass definition. cpp turns this into

‎src/include/catalog/pg_operator.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "catalog/genbki.h"
2222
#include "catalog/objectaddress.h"
23-
#include "catalog/pg_operator_d.h"
23+
#include "catalog/pg_operator_d.h" /* IWYU pragma: export */
2424
#include "nodes/pg_list.h"
2525

2626
/* ----------------

‎src/include/catalog/pg_opfamily.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_OPFAMILY_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_opfamily_d.h"
22+
#include "catalog/pg_opfamily_d.h" /* IWYU pragma: export */
2323

2424
/* ----------------
2525
* pg_opfamily definition. cpp turns this into

‎src/include/catalog/pg_parameter_acl.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define PG_PARAMETER_ACL_H
2121

2222
#include "catalog/genbki.h"
23-
#include "catalog/pg_parameter_acl_d.h"
23+
#include "catalog/pg_parameter_acl_d.h" /* IWYU pragma: export */
2424

2525
/* ----------------
2626
* pg_parameter_acl definition. cpp turns this into

‎src/include/catalog/pg_partitioned_table.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#define PG_PARTITIONED_TABLE_H
2121

2222
#include "catalog/genbki.h"
23-
#include "catalog/pg_partitioned_table_d.h"
23+
#include "catalog/pg_partitioned_table_d.h" /* IWYU pragma: export */
2424

2525
/* ----------------
2626
* pg_partitioned_table definition. cpp turns this into

‎src/include/catalog/pg_policy.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_POLICY_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_policy_d.h"
22+
#include "catalog/pg_policy_d.h" /* IWYU pragma: export */
2323

2424
/* ----------------
2525
* pg_policy definition. cpp turns this into

‎src/include/catalog/pg_proc.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include "catalog/genbki.h"
2121
#include "catalog/objectaddress.h"
22-
#include "catalog/pg_proc_d.h"
22+
#include "catalog/pg_proc_d.h" /* IWYU pragma: export */
2323
#include "nodes/pg_list.h"
2424

2525
/* ----------------

‎src/include/catalog/pg_publication.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
#include "catalog/genbki.h"
2121
#include "catalog/objectaddress.h"
22-
#include "catalog/pg_publication_d.h"
22+
#include "catalog/pg_publication_d.h" /* IWYU pragma: export */
2323

2424
/* ----------------
2525
* pg_publication definition. cpp turns this into

‎src/include/catalog/pg_publication_namespace.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_PUBLICATION_NAMESPACE_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_publication_namespace_d.h"
22+
#include "catalog/pg_publication_namespace_d.h" /* IWYU pragma: export */
2323

2424

2525
/* ----------------

‎src/include/catalog/pg_publication_rel.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_PUBLICATION_REL_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_publication_rel_d.h"
22+
#include "catalog/pg_publication_rel_d.h" /* IWYU pragma: export */
2323

2424
/* ----------------
2525
* pg_publication_rel definition. cpp turns this into

‎src/include/catalog/pg_range.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#define PG_RANGE_H
2020

2121
#include "catalog/genbki.h"
22-
#include "catalog/pg_range_d.h"
22+
#include "catalog/pg_range_d.h" /* IWYU pragma: export */
2323

2424
/* ----------------
2525
* pg_range definition. cpp turns this into

‎src/include/catalog/pg_replication_origin.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
#include "access/xlogdefs.h"
2222
#include "catalog/genbki.h"
23-
#include "catalog/pg_replication_origin_d.h"
23+
#include "catalog/pg_replication_origin_d.h" /* IWYU pragma: export */
2424

2525
/* ----------------
2626
* pg_replication_origin. cpp turns this into

‎src/include/catalog/pg_rewrite.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#define PG_REWRITE_H
2323

2424
#include "catalog/genbki.h"
25-
#include "catalog/pg_rewrite_d.h"
25+
#include "catalog/pg_rewrite_d.h" /* IWYU pragma: export */
2626

2727
/* ----------------
2828
* pg_rewrite definition. cpp turns this into

0 commit comments

Comments
 (0)