Add a new callables feature to Crubit.

Googler · copybara-github · commit f9449966f3a5 · 2026-02-11T18:13:32.000-08:00
The rollout of callables is causing stable Crubit users to get crashes. This change adds a flag to that I can enable/disable callables support without needing to emergency push fixes. It doesn't do anything yet, just updates the goldens to keep the bloat away from the CL that actually does guard the feature in code.

PiperOrigin-RevId: 868930691
diff --git a/cc_bindings_from_rs/test/consts/consts_cc_api.h b/cc_bindings_from_rs/test/consts/consts_cc_api.h
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // consts_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor,
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor,
 // std_unique_ptr, std_vector, supported, wrapper
 
 // clang-format off
diff --git a/cc_bindings_from_rs/test/consts/consts_cc_api_impl.rs b/cc_bindings_from_rs/test/consts/consts_cc_api_impl.rs
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // consts_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #![allow(unused_unsafe, deprecated, non_snake_case, unreachable_code)]
 #![allow(improper_ctypes_definitions)]
diff --git a/cc_bindings_from_rs/test/enums/enums_cc_api.h b/cc_bindings_from_rs/test/enums/enums_cc_api.h
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // enums_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor,
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor,
 // std_unique_ptr, std_vector, supported, wrapper
 
 // clang-format off
diff --git a/cc_bindings_from_rs/test/enums/enums_cc_api_impl.rs b/cc_bindings_from_rs/test/enums/enums_cc_api_impl.rs
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // enums_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #![allow(unused_unsafe, deprecated, non_snake_case, unreachable_code)]
 #![allow(improper_ctypes_definitions)]
diff --git a/cc_bindings_from_rs/test/function_pointers/function_pointers_cc_api.h b/cc_bindings_from_rs/test/function_pointers/function_pointers_cc_api.h
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // function_pointers_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor,
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor,
 // std_unique_ptr, std_vector, supported, wrapper
 
 // clang-format off
diff --git a/cc_bindings_from_rs/test/function_pointers/function_pointers_cc_api_impl.rs b/cc_bindings_from_rs/test/function_pointers/function_pointers_cc_api_impl.rs
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // function_pointers_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #![allow(unused_unsafe, deprecated, non_snake_case, unreachable_code)]
 #![allow(improper_ctypes_definitions)]
diff --git a/cc_bindings_from_rs/test/functions/functions_cc_api.h b/cc_bindings_from_rs/test/functions/functions_cc_api.h
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // functions_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor,
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor,
 // std_unique_ptr, std_vector, supported, wrapper
 
 // clang-format off
diff --git a/cc_bindings_from_rs/test/functions/functions_cc_api_impl.rs b/cc_bindings_from_rs/test/functions/functions_cc_api_impl.rs
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // functions_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #![allow(unused_unsafe, deprecated, non_snake_case, unreachable_code)]
 #![allow(improper_ctypes_definitions)]
diff --git a/cc_bindings_from_rs/test/golden/composable_bridging_cc_api.h b/cc_bindings_from_rs/test/golden/composable_bridging_cc_api.h
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // composable_bridging_rust_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor,
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor,
 // std_unique_ptr, std_vector, supported, wrapper
 
 // clang-format off
diff --git a/cc_bindings_from_rs/test/golden/composable_bridging_cc_api_impl.rs b/cc_bindings_from_rs/test/golden/composable_bridging_cc_api_impl.rs
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // composable_bridging_rust_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #![allow(unused_unsafe, deprecated, non_snake_case, unreachable_code)]
 #![allow(improper_ctypes_definitions)]
diff --git a/cc_bindings_from_rs/test/golden/function_annotations_cc_api.h b/cc_bindings_from_rs/test/golden/function_annotations_cc_api.h
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // function_annotations_rust_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor,
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor,
 // std_unique_ptr, std_vector, supported, wrapper
 
 // clang-format off
@@ -37,4 +37,4 @@ inline std::int32_t add_two_integers(std::int32_t x, std::int32_t y) {
 #pragma clang diagnostic pop
 #endif  // THIRD_PARTY_CRUBIT_CC_BINDINGS_FROM_RS_TEST_GOLDEN_FUNCTION_ANNOTATIONS_RUST_GOLDEN
 
-// This file contains Kythe metadata. eyJ0eXBlIjoia3l0aGUwIiwibWV0YSI6W3sidHlwZSI6ImFuY2hvcl9hbmNob3IiLCJzb3VyY2VfYmVnaW4iOjI0NzYyNiwic291cmNlX2VuZCI6MjQ3NjQyLCJ0YXJnZXRfYmVnaW4iOjEwNDUsInRhcmdldF9lbmQiOjEwNjEsImVkZ2UiOiIva3l0aGUvZWRnZS9pbXB1dGVzIiwic291cmNlX3ZuYW1lIjp7ImNvcnB1cyI6ImNvcnB1cyIsInBhdGgiOiJ0aGlyZF9wYXJ0eS9jcnViaXQvY2NfYmluZGluZ3NfZnJvbV9ycy90ZXN0L2dvbGRlbi9mdW5jdGlvbl9hbm5vdGF0aW9ucy5ycyIsImxhbmd1YWdlIjoicnVzdCJ9fV19
+// This file contains Kythe metadata. eyJ0eXBlIjoia3l0aGUwIiwibWV0YSI6W3sidHlwZSI6ImFuY2hvcl9hbmNob3IiLCJzb3VyY2VfYmVnaW4iOjI0NzYyNiwic291cmNlX2VuZCI6MjQ3NjQyLCJ0YXJnZXRfYmVnaW4iOjEwNTYsInRhcmdldF9lbmQiOjEwNzIsImVkZ2UiOiIva3l0aGUvZWRnZS9pbXB1dGVzIiwic291cmNlX3ZuYW1lIjp7ImNvcnB1cyI6ImNvcnB1cyIsInBhdGgiOiJ0aGlyZF9wYXJ0eS9jcnViaXQvY2NfYmluZGluZ3NfZnJvbV9ycy90ZXN0L2dvbGRlbi9mdW5jdGlvbl9hbm5vdGF0aW9ucy5ycyIsImxhbmd1YWdlIjoicnVzdCJ9fV19
diff --git a/cc_bindings_from_rs/test/golden/function_annotations_cc_api_impl.rs b/cc_bindings_from_rs/test/golden/function_annotations_cc_api_impl.rs
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // function_annotations_rust_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #![allow(unused_unsafe, deprecated, non_snake_case, unreachable_code)]
 #![allow(improper_ctypes_definitions)]
diff --git a/cc_bindings_from_rs/test/golden/non_trivially_destructible_cc_api.h b/cc_bindings_from_rs/test/golden/non_trivially_destructible_cc_api.h
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // non_trivially_destructible_rust_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor,
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor,
 // std_unique_ptr, std_vector, supported, wrapper
 
 // clang-format off
diff --git a/cc_bindings_from_rs/test/golden/non_trivially_destructible_cc_api_impl.rs b/cc_bindings_from_rs/test/golden/non_trivially_destructible_cc_api_impl.rs
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // non_trivially_destructible_rust_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #![allow(unused_unsafe, deprecated, non_snake_case, unreachable_code)]
 #![allow(improper_ctypes_definitions)]
diff --git a/cc_bindings_from_rs/test/golden/struct_with_conflicting_fields_and_member_functions_cc_api.h b/cc_bindings_from_rs/test/golden/struct_with_conflicting_fields_and_member_functions_cc_api.h
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // struct_with_conflicting_fields_and_member_functions_rust_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor,
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor,
 // std_unique_ptr, std_vector, supported, wrapper
 
 // clang-format off
diff --git a/cc_bindings_from_rs/test/golden/struct_with_conflicting_fields_and_member_functions_cc_api_impl.rs b/cc_bindings_from_rs/test/golden/struct_with_conflicting_fields_and_member_functions_cc_api_impl.rs
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // struct_with_conflicting_fields_and_member_functions_rust_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #![allow(unused_unsafe, deprecated, non_snake_case, unreachable_code)]
 #![allow(improper_ctypes_definitions)]
diff --git a/cc_bindings_from_rs/test/golden/tag_decl_annotations_cc_api.h b/cc_bindings_from_rs/test/golden/tag_decl_annotations_cc_api.h
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // tag_decl_annotations_rust_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor,
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor,
 // std_unique_ptr, std_vector, supported, wrapper
 
 // clang-format off
@@ -91,4 +91,4 @@ inline void SomeStruct::__crubit_field_offset_assertions() {
 #pragma clang diagnostic pop
 #endif  // THIRD_PARTY_CRUBIT_CC_BINDINGS_FROM_RS_TEST_GOLDEN_TAG_DECL_ANNOTATIONS_RUST_GOLDEN
 
-// This file contains Kythe metadata. eyJ0eXBlIjoia3l0aGUwIiwibWV0YSI6W3sidHlwZSI6ImFuY2hvcl9hbmNob3IiLCJzb3VyY2VfYmVnaW4iOjI0NzY5OSwic291cmNlX2VuZCI6MjQ3NzA3LCJ0YXJnZXRfYmVnaW4iOjEwNTQsInRhcmdldF9lbmQiOjEwNjIsImVkZ2UiOiIva3l0aGUvZWRnZS9pbXB1dGVzIiwic291cmNlX3ZuYW1lIjp7ImNvcnB1cyI6ImNvcnB1cyIsInBhdGgiOiJ0aGlyZF9wYXJ0eS9jcnViaXQvY2NfYmluZGluZ3NfZnJvbV9ycy90ZXN0L2dvbGRlbi90YWdfZGVjbF9hbm5vdGF0aW9ucy5ycyIsImxhbmd1YWdlIjoicnVzdCJ9fSx7InR5cGUiOiJhbmNob3JfYW5jaG9yIiwic291cmNlX2JlZ2luIjoyNDc3NDQsInNvdXJjZV9lbmQiOjI0Nzc1MywidGFyZ2V0X2JlZ2luIjoxMTk1LCJ0YXJnZXRfZW5kIjoxMjA0LCJlZGdlIjoiL2t5dGhlL2VkZ2UvaW1wdXRlcyIsInNvdXJjZV92bmFtZSI6eyJjb3JwdXMiOiJjb3JwdXMiLCJwYXRoIjoidGhpcmRfcGFydHkvY3J1Yml0L2NjX2JpbmRpbmdzX2Zyb21fcnMvdGVzdC9nb2xkZW4vdGFnX2RlY2xfYW5ub3RhdGlvbnMucnMiLCJsYW5ndWFnZSI6InJ1c3QifX0seyJ0eXBlIjoiYW5jaG9yX2FuY2hvciIsInNvdXJjZV9iZWdpbiI6MjQ3NzkzLCJzb3VyY2VfZW5kIjoyNDc4MDIsInRhcmdldF9iZWdpbiI6MTMzNSwidGFyZ2V0X2VuZCI6MTM0NCwiZWRnZSI6Ii9reXRoZS9lZGdlL2ltcHV0ZXMiLCJzb3VyY2Vfdm5hbWUiOnsiY29ycHVzIjoiY29ycHVzIiwicGF0aCI6InRoaXJkX3BhcnR5L2NydWJpdC9jY19iaW5kaW5nc19mcm9tX3JzL3Rlc3QvZ29sZGVuL3RhZ19kZWNsX2Fubm90YXRpb25zLnJzIiwibGFuZ3VhZ2UiOiJydXN0In19LHsidHlwZSI6ImFuY2hvcl9hbmNob3IiLCJzb3VyY2VfYmVnaW4iOjI0Nzg0Miwic291cmNlX2VuZCI6MjQ3ODUxLCJ0YXJnZXRfYmVnaW4iOjE0NzUsInRhcmdldF9lbmQiOjE0ODQsImVkZ2UiOiIva3l0aGUvZWRnZS9pbXB1dGVzIiwic291cmNlX3ZuYW1lIjp7ImNvcnB1cyI6ImNvcnB1cyIsInBhdGgiOiJ0aGlyZF9wYXJ0eS9jcnViaXQvY2NfYmluZGluZ3NfZnJvbV9ycy90ZXN0L2dvbGRlbi90YWdfZGVjbF9hbm5vdGF0aW9ucy5ycyIsImxhbmd1YWdlIjoicnVzdCJ9fSx7InR5cGUiOiJhbmNob3JfYW5jaG9yIiwic291cmNlX2JlZ2luIjoyNDc4OTEsInNvdXJjZV9lbmQiOjI0NzkwMSwidGFyZ2V0X2JlZ2luIjoxNzQyLCJ0YXJnZXRfZW5kIjoxNzUyLCJlZGdlIjoiL2t5dGhlL2VkZ2UvaW1wdXRlcyIsInNvdXJjZV92bmFtZSI6eyJjb3JwdXMiOiJjb3JwdXMiLCJwYXRoIjoidGhpcmRfcGFydHkvY3J1Yml0L2NjX2JpbmRpbmdzX2Zyb21fcnMvdGVzdC9nb2xkZW4vdGFnX2RlY2xfYW5ub3RhdGlvbnMucnMiLCJsYW5ndWFnZSI6InJ1c3QifX0seyJ0eXBlIjoiYW5jaG9yX2FuY2hvciIsInNvdXJjZV9iZWdpbiI6MjQ3OTEyLCJzb3VyY2VfZW5kIjoyNDc5MTMsInRhcmdldF9iZWdpbiI6MjUxMCwidGFyZ2V0X2VuZCI6MjUxMSwiZWRnZSI6Ii9reXRoZS9lZGdlL2ltcHV0ZXMiLCJzb3VyY2Vfdm5hbWUiOnsiY29ycHVzIjoiY29ycHVzIiwicGF0aCI6InRoaXJkX3BhcnR5L2NydWJpdC9jY19iaW5kaW5nc19mcm9tX3JzL3Rlc3QvZ29sZGVuL3RhZ19kZWNsX2Fubm90YXRpb25zLnJzIiwibGFuZ3VhZ2UiOiJydXN0In19XX0=
+// This file contains Kythe metadata. eyJ0eXBlIjoia3l0aGUwIiwibWV0YSI6W3sidHlwZSI6ImFuY2hvcl9hbmNob3IiLCJzb3VyY2VfYmVnaW4iOjI0NzY5OSwic291cmNlX2VuZCI6MjQ3NzA3LCJ0YXJnZXRfYmVnaW4iOjEwNjUsInRhcmdldF9lbmQiOjEwNzMsImVkZ2UiOiIva3l0aGUvZWRnZS9pbXB1dGVzIiwic291cmNlX3ZuYW1lIjp7ImNvcnB1cyI6ImNvcnB1cyIsInBhdGgiOiJ0aGlyZF9wYXJ0eS9jcnViaXQvY2NfYmluZGluZ3NfZnJvbV9ycy90ZXN0L2dvbGRlbi90YWdfZGVjbF9hbm5vdGF0aW9ucy5ycyIsImxhbmd1YWdlIjoicnVzdCJ9fSx7InR5cGUiOiJhbmNob3JfYW5jaG9yIiwic291cmNlX2JlZ2luIjoyNDc3NDQsInNvdXJjZV9lbmQiOjI0Nzc1MywidGFyZ2V0X2JlZ2luIjoxMjA2LCJ0YXJnZXRfZW5kIjoxMjE1LCJlZGdlIjoiL2t5dGhlL2VkZ2UvaW1wdXRlcyIsInNvdXJjZV92bmFtZSI6eyJjb3JwdXMiOiJjb3JwdXMiLCJwYXRoIjoidGhpcmRfcGFydHkvY3J1Yml0L2NjX2JpbmRpbmdzX2Zyb21fcnMvdGVzdC9nb2xkZW4vdGFnX2RlY2xfYW5ub3RhdGlvbnMucnMiLCJsYW5ndWFnZSI6InJ1c3QifX0seyJ0eXBlIjoiYW5jaG9yX2FuY2hvciIsInNvdXJjZV9iZWdpbiI6MjQ3NzkzLCJzb3VyY2VfZW5kIjoyNDc4MDIsInRhcmdldF9iZWdpbiI6MTM0NiwidGFyZ2V0X2VuZCI6MTM1NSwiZWRnZSI6Ii9reXRoZS9lZGdlL2ltcHV0ZXMiLCJzb3VyY2Vfdm5hbWUiOnsiY29ycHVzIjoiY29ycHVzIiwicGF0aCI6InRoaXJkX3BhcnR5L2NydWJpdC9jY19iaW5kaW5nc19mcm9tX3JzL3Rlc3QvZ29sZGVuL3RhZ19kZWNsX2Fubm90YXRpb25zLnJzIiwibGFuZ3VhZ2UiOiJydXN0In19LHsidHlwZSI6ImFuY2hvcl9hbmNob3IiLCJzb3VyY2VfYmVnaW4iOjI0Nzg0Miwic291cmNlX2VuZCI6MjQ3ODUxLCJ0YXJnZXRfYmVnaW4iOjE0ODYsInRhcmdldF9lbmQiOjE0OTUsImVkZ2UiOiIva3l0aGUvZWRnZS9pbXB1dGVzIiwic291cmNlX3ZuYW1lIjp7ImNvcnB1cyI6ImNvcnB1cyIsInBhdGgiOiJ0aGlyZF9wYXJ0eS9jcnViaXQvY2NfYmluZGluZ3NfZnJvbV9ycy90ZXN0L2dvbGRlbi90YWdfZGVjbF9hbm5vdGF0aW9ucy5ycyIsImxhbmd1YWdlIjoicnVzdCJ9fSx7InR5cGUiOiJhbmNob3JfYW5jaG9yIiwic291cmNlX2JlZ2luIjoyNDc4OTEsInNvdXJjZV9lbmQiOjI0NzkwMSwidGFyZ2V0X2JlZ2luIjoxNzUzLCJ0YXJnZXRfZW5kIjoxNzYzLCJlZGdlIjoiL2t5dGhlL2VkZ2UvaW1wdXRlcyIsInNvdXJjZV92bmFtZSI6eyJjb3JwdXMiOiJjb3JwdXMiLCJwYXRoIjoidGhpcmRfcGFydHkvY3J1Yml0L2NjX2JpbmRpbmdzX2Zyb21fcnMvdGVzdC9nb2xkZW4vdGFnX2RlY2xfYW5ub3RhdGlvbnMucnMiLCJsYW5ndWFnZSI6InJ1c3QifX0seyJ0eXBlIjoiYW5jaG9yX2FuY2hvciIsInNvdXJjZV9iZWdpbiI6MjQ3OTEyLCJzb3VyY2VfZW5kIjoyNDc5MTMsInRhcmdldF9iZWdpbiI6MjUyMSwidGFyZ2V0X2VuZCI6MjUyMiwiZWRnZSI6Ii9reXRoZS9lZGdlL2ltcHV0ZXMiLCJzb3VyY2Vfdm5hbWUiOnsiY29ycHVzIjoiY29ycHVzIiwicGF0aCI6InRoaXJkX3BhcnR5L2NydWJpdC9jY19iaW5kaW5nc19mcm9tX3JzL3Rlc3QvZ29sZGVuL3RhZ19kZWNsX2Fubm90YXRpb25zLnJzIiwibGFuZ3VhZ2UiOiJydXN0In19XX0=
diff --git a/cc_bindings_from_rs/test/golden/tag_decl_annotations_cc_api_impl.rs b/cc_bindings_from_rs/test/golden/tag_decl_annotations_cc_api_impl.rs
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // tag_decl_annotations_rust_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #![allow(unused_unsafe, deprecated, non_snake_case, unreachable_code)]
 #![allow(improper_ctypes_definitions)]
diff --git a/cc_bindings_from_rs/test/golden/type_aliases_cc_api.h b/cc_bindings_from_rs/test/golden/type_aliases_cc_api.h
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // type_aliases_rust_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor,
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor,
 // std_unique_ptr, std_vector, supported, wrapper
 
 // clang-format off
diff --git a/cc_bindings_from_rs/test/golden/type_aliases_cc_api_impl.rs b/cc_bindings_from_rs/test/golden/type_aliases_cc_api_impl.rs
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // type_aliases_rust_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #![allow(unused_unsafe, deprecated, non_snake_case, unreachable_code)]
 #![allow(improper_ctypes_definitions)]
diff --git a/cc_bindings_from_rs/test/golden/uses_cc_api.h b/cc_bindings_from_rs/test/golden/uses_cc_api.h
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // uses_rust_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor,
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor,
 // std_unique_ptr, std_vector, supported, wrapper
 
 // clang-format off
diff --git a/cc_bindings_from_rs/test/golden/uses_cc_api_impl.rs b/cc_bindings_from_rs/test/golden/uses_cc_api_impl.rs
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // uses_rust_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #![allow(unused_unsafe, deprecated, non_snake_case, unreachable_code)]
 #![allow(improper_ctypes_definitions)]
diff --git a/cc_bindings_from_rs/test/primitive_types/primitive_types_cc_api.h b/cc_bindings_from_rs/test/primitive_types/primitive_types_cc_api.h
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // primitive_types_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor,
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor,
 // std_unique_ptr, std_vector, supported, wrapper
 
 // clang-format off
diff --git a/cc_bindings_from_rs/test/primitive_types/primitive_types_cc_api_impl.rs b/cc_bindings_from_rs/test/primitive_types/primitive_types_cc_api_impl.rs
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // primitive_types_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #![allow(unused_unsafe, deprecated, non_snake_case, unreachable_code)]
 #![allow(improper_ctypes_definitions)]
diff --git a/cc_bindings_from_rs/test/traits/traits_cc_api.h b/cc_bindings_from_rs/test/traits/traits_cc_api.h
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // traits_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor,
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor,
 // std_unique_ptr, std_vector, supported, wrapper
 
 // clang-format off
diff --git a/cc_bindings_from_rs/test/traits/traits_cc_api_impl.rs b/cc_bindings_from_rs/test/traits/traits_cc_api_impl.rs
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // traits_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #![allow(unused_unsafe, deprecated, non_snake_case, unreachable_code)]
 #![allow(improper_ctypes_definitions)]
diff --git a/cc_bindings_from_rs/test/tuples/tuples_cc_api.h b/cc_bindings_from_rs/test/tuples/tuples_cc_api.h
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // tuples_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor,
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor,
 // std_unique_ptr, std_vector, supported, wrapper
 
 // clang-format off
diff --git a/cc_bindings_from_rs/test/tuples/tuples_cc_api_impl.rs b/cc_bindings_from_rs/test/tuples/tuples_cc_api_impl.rs
@@ -4,7 +4,7 @@
 
 // Automatically @generated C++ bindings for the following Rust crate:
 // tuples_golden
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #![allow(unused_unsafe, deprecated, non_snake_case, unreachable_code)]
 #![allow(improper_ctypes_definitions)]
diff --git a/common/crubit_feature.rs b/common/crubit_feature.rs
@@ -39,6 +39,9 @@ flagset::flags! {
 
         /// Enable formatting to Rust via C++.
         Fmt,
+
+        /// Enable experimental support for `rs_std::DynCallable` and `absl::AnyInvocable`.
+        Callables,
     }
 }
 
@@ -59,6 +62,7 @@ impl CrubitFeature {
             Self::CustomFfiTypes => "custom_ffi_types",
             Self::AssumeLifetimes => "assume_lifetimes",
             Self::Fmt => "fmt",
+            Self::Callables => "callables",
         }
     }
 
@@ -76,6 +80,7 @@ impl CrubitFeature {
             Self::CustomFfiTypes => "//features:custom_ffi_types",
             Self::AssumeLifetimes => "//features:assume_lifetimes",
             Self::Fmt => "//features:fmt",
+            Self::Callables => "//features:callables",
         }
     }
 }
@@ -94,6 +99,7 @@ pub fn named_features(name: &[u8]) -> Option<flagset::FlagSet<CrubitFeature>> {
         b"custom_ffi_types" => CrubitFeature::CustomFfiTypes.into(),
         b"assume_lifetimes" => CrubitFeature::AssumeLifetimes.into(),
         b"fmt" => CrubitFeature::Fmt.into(),
+        b"callables" => CrubitFeature::Callables.into(),
         _ => return None,
     };
     Some(features)
@@ -202,6 +208,7 @@ mod tests {
                 | CrubitFeature::Experimental
                 | CrubitFeature::CustomFfiTypes
                 | CrubitFeature::Fmt
+                | CrubitFeature::Callables
         );
     }
 
@@ -231,6 +238,7 @@ mod tests {
                 | CrubitFeature::Experimental
                 | CrubitFeature::CustomFfiTypes
                 | CrubitFeature::Fmt
+                | CrubitFeature::Callables
         );
     }
 
@@ -248,6 +256,7 @@ mod tests {
                 | CrubitFeature::Experimental
                 | CrubitFeature::CustomFfiTypes
                 | CrubitFeature::Fmt
+                | CrubitFeature::Callables
         );
     }
 }
diff --git a/rs_bindings_from_cc/test/struct/inheritance/inherited_methods_rs_api.rs b/rs_bindings_from_cc/test/struct/inheritance/inherited_methods_rs_api.rs
@@ -4,7 +4,7 @@
 
 // Automatically @generated Rust bindings for the following C++ target:
 // //rs_bindings_from_cc/test/struct/inheritance:inherited_methods
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #![rustfmt::skip]
 #![feature(
diff --git a/rs_bindings_from_cc/test/struct/methods_qualifiers/methods_qualifiers_api_impl.cc b/rs_bindings_from_cc/test/struct/methods_qualifiers/methods_qualifiers_api_impl.cc
@@ -4,7 +4,7 @@
 
 // Automatically @generated Rust bindings for the following C++ target:
 // //rs_bindings_from_cc/test/struct/methods_qualifiers:methods_qualifiers
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #include "support/internal/cxx20_backports.h"
 #include "support/internal/offsetof.h"
diff --git a/rs_bindings_from_cc/test/struct/methods_qualifiers/methods_qualifiers_rs_api.rs b/rs_bindings_from_cc/test/struct/methods_qualifiers/methods_qualifiers_rs_api.rs
@@ -4,7 +4,7 @@
 
 // Automatically @generated Rust bindings for the following C++ target:
 // //rs_bindings_from_cc/test/struct/methods_qualifiers:methods_qualifiers
-// Features: custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
+// Features: callables, custom_ffi_types, experimental, fmt, non_unpin_ctor, std_unique_ptr, std_vector, supported, wrapper
 
 #![rustfmt::skip]
 #![feature(
diff --git a/rs_bindings_from_cc/test/templates/type_alias/type_alias_api_impl.cc b/rs_bindings_from_cc/test/templates/type_alias/type_alias_api_impl.cc
diff --git a/rs_bindings_from_cc/test/templates/type_alias/type_alias_rs_api.rs b/rs_bindings_from_cc/test/templates/type_alias/type_alias_rs_api.rs
diff --git a/rs_bindings_from_cc/test/templates/type_alias_access_rule/type_alias_access_rule_rs_api.rs b/rs_bindings_from_cc/test/templates/type_alias_access_rule/type_alias_access_rule_rs_api.rs
