Output aesthetics tweaks: __NEWLINE__ b/w `private:` and comments.
This CL has been manually tested by looking at the output generated by
`cc_bindings_from_rs`. Ideally the effects of this CL would be covered by
automated test/golden tests but implementing them is blocked by an unrelated
issue.
PiperOrigin-RevId: 539030552
diff --git a/cc_bindings_from_rs/bindings.rs b/cc_bindings_from_rs/bindings.rs
index f19679a..a684121 100644
--- a/cc_bindings_from_rs/bindings.rs
+++ b/cc_bindings_from_rs/bindings.rs
@@ -1398,7 +1398,7 @@
if size > 0 {
let size = Literal::u64_unsuffixed(size);
quote! {
- private:
+ private: __NEWLINE__
__COMMENT__ #msg
unsigned char #cc_name[#size];
}
@@ -1408,7 +1408,7 @@
// field entirely. This also requires removing the field's assertions,
// added above.
quote! {
- private:
+ private: __NEWLINE__
__COMMENT__ #msg
[[no_unique_address]] struct{} #cc_name;
}
@@ -1432,7 +1432,7 @@
let doc_comment = field.doc_comment;
// TODO(b/271002281): Preserve doc comments.
quote! {
- #visibility
+ #visibility __NEWLINE__
#doc_comment
#cc_type #cc_name;
#padding
@@ -1673,8 +1673,7 @@
let impl_items_main_api = if impl_items_main_api.tokens.is_empty() {
quote! {}
} else {
- let tokens = impl_items_main_api.into_tokens(&mut prereqs);
- quote! { public: #tokens }
+ impl_items_main_api.into_tokens(&mut prereqs)
};
let fields_main_api = fields_main_api.into_tokens(&mut prereqs);
prereqs.fwd_decls.remove(&local_def_id);
@@ -1684,11 +1683,11 @@
tokens: quote! {
__NEWLINE__ #doc_comment
#keyword #(#attributes)* #adt_cc_name final {
- public:
+ public: __NEWLINE__
#default_ctor_main_api
#copy_ctor_and_assignment_main_api
#core
- #impl_items_main_api
+ #impl_items_main_api
#fields_main_api
};
__NEWLINE__
