diff options
author | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2022-12-23 17:18:42 +0100 |
---|---|---|
committer | Paul Cristian Sarbu <paul.cristian.sarbu@huawei.com> | 2022-12-23 18:29:08 +0100 |
commit | 0374b80dd407d7b35654a01e3c7526b749d3464e (patch) | |
tree | d0e62aece120c764ad557501e60398317c7dc77a | |
parent | 1de5a178bc804209eeeb512023de1ce4d77eef42 (diff) | |
download | justbuild-0374b80dd407d7b35654a01e3c7526b749d3464e.tar.gz |
Just-MR: Remove wrong pass-by-reference when wrapping loggers
Passing the logger by reference would require the caller to be
kept alive. Also, being a shared_ptr, the logger can be passed
by value at almost no cost.
-rw-r--r-- | src/buildtool/file_system/git_repo.cpp | 8 | ||||
-rw-r--r-- | src/other_tools/git_operations/git_operations.cpp | 8 | ||||
-rw-r--r-- | src/other_tools/ops_maps/git_update_map.cpp | 2 | ||||
-rw-r--r-- | src/other_tools/ops_maps/import_to_git_map.cpp | 10 | ||||
-rw-r--r-- | src/other_tools/repo_map/repos_to_setup_map.cpp | 2 | ||||
-rw-r--r-- | src/other_tools/root_maps/commit_git_map.cpp | 14 | ||||
-rw-r--r-- | src/other_tools/root_maps/fpath_git_map.cpp | 4 |
7 files changed, 24 insertions, 24 deletions
diff --git a/src/buildtool/file_system/git_repo.cpp b/src/buildtool/file_system/git_repo.cpp index e51c404e..7a4915a3 100644 --- a/src/buildtool/file_system/git_repo.cpp +++ b/src/buildtool/file_system/git_repo.cpp @@ -1082,7 +1082,7 @@ auto GitRepo::GetSubtreeFromPath(std::filesystem::path const& fpath, } // setup wrapped logger auto wrapped_logger = std::make_shared<anon_logger_t>( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)( fmt::format("While getting repo root from path:\n{}", msg), fatal); @@ -1095,7 +1095,7 @@ auto GitRepo::GetSubtreeFromPath(std::filesystem::path const& fpath, // setup wrapped logger wrapped_logger = std::make_shared<anon_logger_t>( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)(fmt::format("While going subtree hash retrieval from " "path:\n{}", msg), @@ -1182,7 +1182,7 @@ auto GitRepo::UpdateCommitViaTmpRepo(std::filesystem::path const& tmp_repo_path, } // setup wrapped logger auto wrapped_logger = std::make_shared<anon_logger_t>( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)( fmt::format("While doing commit update via tmp repo:\n{}", msg), @@ -1228,7 +1228,7 @@ auto GitRepo::FetchViaTmpRepo(std::filesystem::path const& tmp_repo_path, std::numeric_limits<int>::max()) == 0) { // setup wrapped logger auto wrapped_logger = std::make_shared<anon_logger_t>( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)( fmt::format( "While doing branch fetch via tmp repo:\n{}", msg), diff --git a/src/other_tools/git_operations/git_operations.cpp b/src/other_tools/git_operations/git_operations.cpp index 2b519691..bf6b29b3 100644 --- a/src/other_tools/git_operations/git_operations.cpp +++ b/src/other_tools/git_operations/git_operations.cpp @@ -34,7 +34,7 @@ auto CriticalGitOps::GitInitialCommit(GitOpParams const& crit_op_params, } // setup wrapped logger auto wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)( fmt::format("While doing initial commit Git op:\n{}", msg), fatal); @@ -95,7 +95,7 @@ auto CriticalGitOps::GitKeepTag(GitOpParams const& crit_op_params, } // setup wrapped logger auto wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)(fmt::format("While doing keep tag Git op:\n{}", msg), fatal); }); @@ -129,7 +129,7 @@ auto CriticalGitOps::GitGetHeadId(GitOpParams const& crit_op_params, } // setup wrapped logger auto wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)(fmt::format("While doing get HEAD id Git op:\n{}", msg), fatal); }); @@ -162,7 +162,7 @@ auto CriticalGitOps::GitGetBranchRefname( } // setup wrapped logger auto wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)( fmt::format("While doing get branch refname Git op:\n{}", msg), fatal); diff --git a/src/other_tools/ops_maps/git_update_map.cpp b/src/other_tools/ops_maps/git_update_map.cpp index b1172084..73eccfe0 100644 --- a/src/other_tools/ops_maps/git_update_map.cpp +++ b/src/other_tools/ops_maps/git_update_map.cpp @@ -45,7 +45,7 @@ auto CreateGitUpdateMap(GitCASPtr const& git_cas, std::size_t jobs) } // setup wrapped logger auto wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)( fmt::format("While updating commit via tmp repo:\n{}", msg), fatal); diff --git a/src/other_tools/ops_maps/import_to_git_map.cpp b/src/other_tools/ops_maps/import_to_git_map.cpp index 45e7265c..05be1c8b 100644 --- a/src/other_tools/ops_maps/import_to_git_map.cpp +++ b/src/other_tools/ops_maps/import_to_git_map.cpp @@ -101,8 +101,8 @@ auto CreateImportToGitMap( } auto wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger, target_path](auto const& msg, - bool fatal) { + [logger, target_path](auto const& msg, + bool fatal) { (*logger)( fmt::format("While fetch via tmp repo " "for target {}:\n{}", @@ -121,8 +121,8 @@ auto CreateImportToGitMap( // setup a wrapped_logger wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger, target_path](auto const& msg, - bool fatal) { + [logger, target_path](auto const& msg, + bool fatal) { (*logger)( fmt::format("While doing keep commit " "and setting Git tree:\n{}", @@ -197,7 +197,7 @@ void KeepCommitAndSetTree( } // get tree id and return it auto wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger, commit](auto const& msg, bool fatal) { + [logger, commit](auto const& msg, bool fatal) { (*logger)( fmt::format("While getting subtree from commit {}:\n{}", commit, diff --git a/src/other_tools/repo_map/repos_to_setup_map.cpp b/src/other_tools/repo_map/repos_to_setup_map.cpp index 04c3229d..c0327d18 100644 --- a/src/other_tools/repo_map/repos_to_setup_map.cpp +++ b/src/other_tools/repo_map/repos_to_setup_map.cpp @@ -545,7 +545,7 @@ auto CreateReposToSetupMap(std::shared_ptr<Configuration> const& config, } // setup a wrapped_logger auto wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger, repo_name = key](auto const& msg, bool fatal) { + [logger, repo_name = key](auto const& msg, bool fatal) { (*logger)( fmt::format("While checking out repository {}:\n{}", repo_name, diff --git a/src/other_tools/root_maps/commit_git_map.cpp b/src/other_tools/root_maps/commit_git_map.cpp index deefaa32..e8dfeef4 100644 --- a/src/other_tools/root_maps/commit_git_map.cpp +++ b/src/other_tools/root_maps/commit_git_map.cpp @@ -81,8 +81,8 @@ auto CreateCommitGitMap( } // setup a wrapped_logger auto wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger, target_path = repo_root](auto const& msg, - bool fatal) { + [logger, target_path = repo_root](auto const& msg, + bool fatal) { (*logger)(fmt::format("While ensuring commit for " "repository {}:\n{}", target_path.string(), @@ -127,7 +127,7 @@ void EnsureCommit(GitRepoInfo const& repo_info, } // setup wrapped logger auto wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)(fmt::format("While checking commit exists:\n{}", msg), fatal); }); @@ -181,7 +181,7 @@ void EnsureCommit(GitRepoInfo const& repo_info, } // setup wrapped logger auto wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)(fmt::format( "While fetching via tmp repo:\n{}", msg), fatal); @@ -194,7 +194,7 @@ void EnsureCommit(GitRepoInfo const& repo_info, } // setup wrapped logger wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)(fmt::format( "While checking commit exists:\n{}", msg), fatal); @@ -247,7 +247,7 @@ void EnsureCommit(GitRepoInfo const& repo_info, // setup wrapped logger auto wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)( fmt::format("While getting subtree " "from commit:\n{}", @@ -284,7 +284,7 @@ void EnsureCommit(GitRepoInfo const& repo_info, else { // setup wrapped logger auto wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)( fmt::format("While getting subtree from commit:\n{}", msg), fatal); diff --git a/src/other_tools/root_maps/fpath_git_map.cpp b/src/other_tools/root_maps/fpath_git_map.cpp index 25218368..e50afeb4 100644 --- a/src/other_tools/root_maps/fpath_git_map.cpp +++ b/src/other_tools/root_maps/fpath_git_map.cpp @@ -31,7 +31,7 @@ auto CreateFilePathGitMap( auto const& key) { // setup wrapped logger auto wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)( fmt::format("While getting repo root from path:\n{}", msg), fatal); @@ -91,7 +91,7 @@ auto CreateFilePathGitMap( // setup wrapped logger auto wrapped_logger = std::make_shared<AsyncMapConsumerLogger>( - [&logger](auto const& msg, bool fatal) { + [logger](auto const& msg, bool fatal) { (*logger)( fmt::format("While getting subtree from " "path:\n{}", |