diff options
Diffstat (limited to 'src/buildtool/build_engine')
4 files changed, 20 insertions, 21 deletions
diff --git a/src/buildtool/build_engine/base_maps/expression_map.cpp b/src/buildtool/build_engine/base_maps/expression_map.cpp index 02a875cc..30722bf3 100644 --- a/src/buildtool/build_engine/base_maps/expression_map.cpp +++ b/src/buildtool/build_engine/base_maps/expression_map.cpp @@ -46,11 +46,11 @@ auto CreateExpressionMap( logger, subcaller = std::move(subcaller), id](auto json_values) { - auto const& target_ = id.GetNamedTarget(); - auto func_it = json_values[0]->find(target_.name); + auto const& target = id.GetNamedTarget(); + auto func_it = json_values[0]->find(target.name); if (func_it == json_values[0]->end()) { (*logger)(fmt::format("Cannot find expression {}", - EntityName(target_).ToString()), + EntityName(target).ToString()), true); return; } diff --git a/src/buildtool/build_engine/base_maps/rule_map.cpp b/src/buildtool/build_engine/base_maps/rule_map.cpp index d3766eda..3e90749e 100644 --- a/src/buildtool/build_engine/base_maps/rule_map.cpp +++ b/src/buildtool/build_engine/base_maps/rule_map.cpp @@ -260,14 +260,13 @@ auto CreateRuleMap(gsl::not_null<RuleFileMap*> const& rule_file_map, {id.ToModule()}, [ts, expr_map, repo_config, setter = std::move(setter), logger, id]( auto json_values) { - const auto& target_ = id.GetNamedTarget(); - auto rule_it = json_values[0]->find(target_.name); + const auto& target = id.GetNamedTarget(); + auto rule_it = json_values[0]->find(target.name); if (rule_it == json_values[0]->end()) { - (*logger)( - fmt::format("Cannot find rule {} in {}", - nlohmann::json(target_.name).dump(), - nlohmann::json(target_.module).dump()), - true); + (*logger)(fmt::format("Cannot find rule {} in {}", + nlohmann::json(target.name).dump(), + nlohmann::json(target.module).dump()), + true); return; } diff --git a/src/buildtool/build_engine/target_map/built_in_rules.cpp b/src/buildtool/build_engine/target_map/built_in_rules.cpp index 572c9abb..b4d3a7cd 100644 --- a/src/buildtool/build_engine/target_map/built_in_rules.cpp +++ b/src/buildtool/build_engine/target_map/built_in_rules.cpp @@ -108,18 +108,18 @@ void ReportArtifactWithDependencyOrigin( void ReportStagingConflict( const std::string& location, - const ExpressionPtr& stage_A, - const ExpressionPtr& stage_B, + const ExpressionPtr& stage_a, + const ExpressionPtr& stage_b, const std::unordered_map<BuildMaps::Base::EntityName, AnalysedTargetPtr>& deps_by_target, const BuildMaps::Target::TargetMap::LoggerPtr& logger) { std::stringstream msg{}; - auto artifact_A = stage_A->Get(location, Expression::kNone); - auto artifact_B = stage_B->Get(location, Expression::kNone); + auto artifact_a = stage_a->Get(location, Expression::kNone); + auto artifact_b = stage_b->Get(location, Expression::kNone); msg << "Staging conflict on path " << nlohmann::json(location).dump() << " between\n"; - ReportArtifactWithDependencyOrigin(artifact_A, deps_by_target, &msg); - ReportArtifactWithDependencyOrigin(artifact_B, deps_by_target, &msg); + ReportArtifactWithDependencyOrigin(artifact_a, deps_by_target, &msg); + ReportArtifactWithDependencyOrigin(artifact_b, deps_by_target, &msg); (*logger)(msg.str(), true); } @@ -868,12 +868,11 @@ void InstallRule( auto files = std::unordered_map<std::string, BuildMaps::Base::EntityName>{}; files.reserve(files_exp->Map().size()); for (auto const& [path, dep_exp] : files_exp->Map()) { - std::string path_ = path; // Have a variable to capture auto dep_name = dep_exp.Evaluate( - param_config, {}, [&logger, &path_](auto const& msg) { + param_config, {}, [&logger, &path = path](auto const& msg) { (*logger)( fmt::format( - "While evaluating files entry for {}:\n{}", path_, msg), + "While evaluating files entry for {}:\n{}", path, msg), true); }); if (not dep_name) { diff --git a/src/buildtool/build_engine/target_map/target_map.cpp b/src/buildtool/build_engine/target_map/target_map.cpp index 5dd9b7cf..02aae13b 100644 --- a/src/buildtool/build_engine/target_map/target_map.cpp +++ b/src/buildtool/build_engine/target_map/target_map.cpp @@ -1632,11 +1632,12 @@ void TreeTarget( directory_entries) { const auto& target = key.target.GetNamedTarget(); const auto dir_name = std::filesystem::path{target.module} / target.name; - auto module_ = BuildMaps::Base::ModuleName{target.repository, dir_name}; + auto target_module = + BuildMaps::Base::ModuleName{target.repository, dir_name}; directory_entries->ConsumeAfterKeysReady( ts, - {module_}, + {target_module}, [context, setter, subcaller, target, key, result_map, logger, dir_name]( auto values) { // expected values.size() == 1 |