Skip to content

Commit 3814599

Browse files
committed
Convert most auto types in file
To avoid needing to look up return types of various functions and methods.
1 parent eafc967 commit 3814599

1 file changed

Lines changed: 18 additions & 14 deletions

File tree

  • base/cvd/cuttlefish/host/commands/cvd/cli/selector

base/cvd/cuttlefish/host/commands/cvd/cli/selector/selector.cpp

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
#include <iostream>
2020
#include <memory>
21-
#include <ostream>
2221
#include <sstream>
2322
#include <string>
2423
#include <utility>
@@ -38,7 +37,8 @@ namespace {
3837

3938
Result<LocalInstanceGroup> GetDefaultGroup(
4039
const InstanceManager& instance_manager) {
41-
const auto all_groups = CF_EXPECT(instance_manager.FindGroups({}));
40+
const std::vector<LocalInstanceGroup> all_groups =
41+
CF_EXPECT(instance_manager.FindGroups({}));
4242
CF_EXPECTF(all_groups.size() == 1,
4343
"There are {} instance groups, unable to pick one",
4444
all_groups.size());
@@ -50,15 +50,16 @@ Result<InstanceDatabase::Filter> BuildFilterFromSelectors(
5050
InstanceDatabase::Filter filter;
5151
filter.group_name = selectors.group_name;
5252
if (selectors.instance_names) {
53-
const auto per_instance_names = selectors.instance_names.value();
53+
const std::vector<std::string> per_instance_names =
54+
selectors.instance_names.value();
5455
for (const auto& per_instance_name : per_instance_names) {
5556
filter.instance_names.insert(per_instance_name);
5657
}
5758
}
5859
auto it = env.find(kCuttlefishInstanceEnvVarName);
5960
if (it != env.end()) {
6061
unsigned id;
61-
auto cuttlefish_instance = it->second;
62+
std::string cuttlefish_instance = it->second;
6263
CF_EXPECT(absl::SimpleAtoi(cuttlefish_instance, &id));
6364
}
6465

@@ -92,7 +93,7 @@ Result<LocalInstanceGroup> PromptUserForGroup(
9293
// show the menu and let the user choose
9394
std::vector<LocalInstanceGroup> groups =
9495
CF_EXPECT(instance_manager.FindGroups({}));
95-
auto menu = SelectionMenu(groups);
96+
std::string menu = SelectionMenu(groups);
9697

9798
std::cout << menu << "\n";
9899
std::unique_ptr<InterruptibleTerminal> terminal_ =
@@ -118,7 +119,8 @@ Result<LocalInstanceGroup> PromptUserForGroup(
118119
}
119120

120121
filter.group_name = chosen_group_name;
121-
auto instance_group_result = instance_manager.FindGroup(filter);
122+
Result<LocalInstanceGroup> instance_group_result =
123+
instance_manager.FindGroup(filter);
122124
if (instance_group_result.ok()) {
123125
return instance_group_result;
124126
}
@@ -134,31 +136,33 @@ Result<LocalInstanceGroup> FindGroupOrDefault(
134136
if (filter.Empty()) {
135137
return CF_EXPECT(GetDefaultGroup(instance_manager));
136138
}
137-
auto groups = CF_EXPECT(instance_manager.FindGroups(filter));
139+
std::vector<LocalInstanceGroup> groups =
140+
CF_EXPECT(instance_manager.FindGroups(filter));
138141
CF_EXPECT_EQ(groups.size(), 1u, "groups.size() = " << groups.size());
139-
return *(groups.cbegin());
142+
return groups.front();
140143
}
141144

142145
Result<std::pair<LocalInstance, LocalInstanceGroup>> FindDefaultInstance(
143146
const InstanceManager& instance_manager) {
144-
auto group = CF_EXPECT(GetDefaultGroup(instance_manager));
145-
const auto instances = group.Instances();
147+
const LocalInstanceGroup group = CF_EXPECT(GetDefaultGroup(instance_manager));
148+
const std::vector<LocalInstance> instances = group.Instances();
146149
CF_EXPECT_EQ(instances.size(), 1u,
147150
"Default instance is the single instance in the default group.");
148-
return std::make_pair(*instances.cbegin(), group);
151+
return std::make_pair(instances.front(), group);
149152
}
150153

151154
} // namespace
152155

153156
Result<LocalInstanceGroup> SelectGroup(const InstanceManager& instance_manager,
154157
const CommandRequest& request) {
155-
auto has_groups = CF_EXPECT(instance_manager.HasInstanceGroups());
158+
const bool has_groups = CF_EXPECT(instance_manager.HasInstanceGroups());
156159
CF_EXPECT(std::move(has_groups), "No instance groups available");
157160
const cvd_common::Envs& env = request.Env();
158-
const auto& selector_options = request.Selectors();
161+
const SelectorOptions& selector_options = request.Selectors();
159162
InstanceDatabase::Filter filter =
160163
CF_EXPECT(BuildFilterFromSelectors(selector_options, request.Env()));
161-
auto group_selection_result = FindGroupOrDefault(filter, instance_manager);
164+
Result<LocalInstanceGroup> group_selection_result =
165+
FindGroupOrDefault(filter, instance_manager);
162166
if (group_selection_result.ok()) {
163167
return CF_EXPECT(std::move(group_selection_result));
164168
}

0 commit comments

Comments
 (0)