From 3ff34b9b759dcec40471abfe48c529ad5051fc1e Mon Sep 17 00:00:00 2001 From: Amanpal9 Date: Fri, 30 Oct 2026 21:19:19 +0530 Subject: [PATCH 1/2] generator: Avoid copying quickstart list results --- generator/internal/scaffold_generator.cc | 2 +- generator/internal/scaffold_generator_test.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/generator/internal/scaffold_generator.cc b/generator/internal/scaffold_generator.cc index d2f788c747008..0dfa2188b4a04 100644 --- a/generator/internal/scaffold_generator.cc +++ b/generator/internal/scaffold_generator.cc @@ -983,7 +983,7 @@ int main(int argc, char* argv[]) try { auto client = $library$::ServiceClient( $library$::MakeServiceConnection()); // EDIT HERE - for (auto r : client.List/*EDIT HERE*/(location.FullName())) { + for (auto const& r : client.List/*EDIT HERE*/(location.FullName())) { if (!r) throw std::move(r).status(); std::cout << r->DebugString() << "\n"; } diff --git a/generator/internal/scaffold_generator_test.cc b/generator/internal/scaffold_generator_test.cc index 7ce189110f62e..488112efe1fc3 100644 --- a/generator/internal/scaffold_generator_test.cc +++ b/generator/internal/scaffold_generator_test.cc @@ -401,6 +401,7 @@ TEST_F(ScaffoldGenerator, QuickstartSkeleton) { auto const actual = std::move(os).str(); EXPECT_THAT(actual, HasSubstr("2034")); EXPECT_THAT(actual, Not(HasSubstr("$copyright_year$"))); + EXPECT_THAT(actual, HasSubstr("for (auto const& r : client.List")); } TEST_F(ScaffoldGenerator, QuickstartCMake) { From 4d3995811e6e12809f28b927c5f65b40e9e58a86 Mon Sep 17 00:00:00 2001 From: Amanpal9 Date: Sat, 31 Oct 2026 10:56:57 +0530 Subject: [PATCH 2/2] generator: avoid moving from const list result --- generator/internal/scaffold_generator.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generator/internal/scaffold_generator.cc b/generator/internal/scaffold_generator.cc index 0dfa2188b4a04..c951aa227794d 100644 --- a/generator/internal/scaffold_generator.cc +++ b/generator/internal/scaffold_generator.cc @@ -984,7 +984,7 @@ int main(int argc, char* argv[]) try { $library$::MakeServiceConnection()); // EDIT HERE for (auto const& r : client.List/*EDIT HERE*/(location.FullName())) { - if (!r) throw std::move(r).status(); + if (!r) throw r.status(); std::cout << r->DebugString() << "\n"; }