commit 0dde1eea3b4637285de817d5bc70a269bcf96af5
author Lukasz Anforowicz <lukasza@google.com> Mon Dec 12 15:15:45 2022 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Dec 12 15:16:31 2022 -0800
tree 0b72146312bf5546694df9399563a5ee1320a287
parent 8b68a556ff76a5b9cebfdabb1893eb29f1c5f978

Simplify how `namespace foo::bar { #tokens }` wrapping works.

PiperOrigin-RevId: 494842631

cc_bindings_from_rs/bindings.rs

diff --git a/cc_bindings_from_rs/bindings.rs b/cc_bindings_from_rs/bindings.rs
index 35dcd5d..777865a 100644
--- a/cc_bindings_from_rs/bindings.rs
+++ b/cc_bindings_from_rs/bindings.rs
@@ -995,10 +995,10 @@
         .group_by(|local_def_id| FullyQualifiedName::new(tcx, local_def_id.to_def_id()).mod_path)
         .into_iter()
         .map(|(mod_path, def_ids)| {
-            let MixedSnippet { rs, cc: CcSnippet { tokens, prereqs } } =
+            let mut snippet: MixedSnippet =
                 def_ids.map(|def_id| bindings.remove(&def_id).unwrap()).sum();
-            let tokens = mod_path.format_with_cc_body(tokens)?;
-            Ok(MixedSnippet { rs, cc: CcSnippet { tokens, prereqs } })
+            snippet.cc.tokens = mod_path.format_with_cc_body(snippet.cc.tokens)?;
+            Ok(snippet)
         })
         .collect::<Result<Vec<_>>>()?;