diff options
21 files changed, 39 insertions, 38 deletions
diff --git a/src/buildtool/auth/authentication.hpp b/src/buildtool/auth/authentication.hpp index 447d9f1c..a903f7fe 100644 --- a/src/buildtool/auth/authentication.hpp +++ b/src/buildtool/auth/authentication.hpp @@ -99,7 +99,7 @@ class Auth { return false; } - // to enable mTLS, both tls_client_{ceritifcate,key} must be + // to enable mTLS, both tls_client_{certificate,key} must be // supplied if (ClientCert().empty() && not(ClientKey().empty())) { Logger::Log(LogLevel::Error, @@ -112,7 +112,7 @@ class Auth { return false; } - // to enable mTLS, both tls_server_{ceritifcate,key} must be + // to enable mTLS, both tls_server_{certificate,key} must be // supplied if (ServerCert().empty() && not(ServerKey().empty())) { Logger::Log(LogLevel::Error, diff --git a/src/buildtool/build_engine/expression/evaluator.cpp b/src/buildtool/build_engine/expression/evaluator.cpp index e9a6a679..6c9d47c3 100644 --- a/src/buildtool/build_engine/expression/evaluator.cpp +++ b/src/buildtool/build_engine/expression/evaluator.cpp @@ -357,12 +357,12 @@ auto UnaryExpr(std::function<ExpressionPtr(ExpressionPtr const&)> const& f) return f(argument); } catch (Evaluator::EvaluationError const& ex) { throw Evaluator::EvaluationError::WhileEval( - fmt::format("Having evaluted the argument to {}:", + fmt::format("Having evaluated the argument to {}:", argument->ToString()), ex); } catch (std::exception const& ex) { throw Evaluator::EvaluationError::WhileEvaluating( - fmt::format("Having evaluted the argument to {}:", + fmt::format("Having evaluated the argument to {}:", argument->ToString()), ex); } @@ -856,7 +856,7 @@ auto DisjointUnionExpr(SubExprEvaluator&& eval, auto msg_expr = expr->Map().Find("msg"); if (not msg_expr) { throw Evaluator::EvaluationError::WhileEvaluating( - fmt::format("Having evaluted the argument to {}:", + fmt::format("Having evaluated the argument to {}:", argument->ToString()), ex); } diff --git a/src/buildtool/build_engine/expression/linked_map.hpp b/src/buildtool/build_engine/expression/linked_map.hpp index cbf46453..e19c5e68 100644 --- a/src/buildtool/build_engine/expression/linked_map.hpp +++ b/src/buildtool/build_engine/expression/linked_map.hpp @@ -212,7 +212,7 @@ class LinkedMap { auto const& my_items = Items(); auto const& other_items = other.Items(); // Search for duplicates, using that iteration over the items is - // orderd by keys. + // ordered by keys. auto me = my_items.begin(); auto they = other_items.begin(); while (me != my_items.end() and they != other_items.end()) { @@ -360,7 +360,7 @@ class LinkedMap { } } - // No more comaprisons to be made; copy over the remaining + // No more comparisons to be made; copy over the remaining // entries items.insert(items.end(), citemsit, citemsend); items.insert(items.end(), nitemsit, nitemsend); 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 923cd614..8133c5d3 100644 --- a/src/buildtool/build_engine/target_map/built_in_rules.cpp +++ b/src/buildtool/build_engine/target_map/built_in_rules.cpp @@ -811,7 +811,7 @@ void GenericRuleWithDeps( deps_by_transition.emplace(transition_keys[i], *dependency_values[i]); } - // Compute the effective dependecy on config variables + // Compute the effective dependency on config variables std::unordered_set<std::string> effective_vars; auto param_vars = desc->ReadStringList("arguments_config"); effective_vars.insert(param_vars->begin(), param_vars->end()); diff --git a/src/buildtool/build_engine/target_map/target_map.cpp b/src/buildtool/build_engine/target_map/target_map.cpp index 760e8306..e441b705 100644 --- a/src/buildtool/build_engine/target_map/target_map.cpp +++ b/src/buildtool/build_engine/target_map/target_map.cpp @@ -232,7 +232,7 @@ void withDependencies( deps_by_transition.emplace(transition_keys[i], *dependency_values[i]); } - // Compute the effective dependecy on config variables + // Compute the effective dependency on config variables std::unordered_set<std::string> effective_vars; auto const& param_vars = data->target_vars; effective_vars.insert(param_vars.begin(), param_vars.end()); @@ -520,9 +520,10 @@ void withDependencies( auto fail_msg = eval(expr->Get("fail_message", "action failed"s), env); if (not fail_msg->IsString()) { - throw Evaluator::EvaluationError{fmt::format( - "fail_message has to evalute to a string, but got {}", - fail_msg->ToString())}; + throw Evaluator::EvaluationError{ + fmt::format("fail_message has to evaluate to a " + "string, but got {}", + fail_msg->ToString())}; } may_fail = std::optional{fail_msg->String()}; } @@ -842,7 +843,7 @@ void withRuleDefinition( auto const& field_expression = data->config_exprs[field_name]; auto field_value = field_expression.Evaluate( param_config, {}, [&logger, &field_name](auto const& msg) { - (*logger)(fmt::format("While evaluating config fieled {}:\n{}", + (*logger)(fmt::format("While evaluating config field {}:\n{}", field_name, msg), true); diff --git a/src/buildtool/common/artifact_digest.hpp b/src/buildtool/common/artifact_digest.hpp index 11fab86d..56488163 100644 --- a/src/buildtool/common/artifact_digest.hpp +++ b/src/buildtool/common/artifact_digest.hpp @@ -26,9 +26,9 @@ #include "src/utils/cpp/hash_combine.hpp" // Provides getter for size with convenient non-protobuf type. Contains a -// unprefixed hex string as hash. For communication with the exeution API it can -// be cast to bazel_re::Digest which is the wire format that contains prefixed -// hashes in native mode. +// unprefixed hex string as hash. For communication with the execution API it +// can be cast to bazel_re::Digest which is the wire format that contains +// prefixed hashes in native mode. class ArtifactDigest { friend struct std::hash<ArtifactDigest>; diff --git a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp index ef8b2f5d..edc99cff 100644 --- a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp +++ b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp @@ -253,7 +253,7 @@ template <class T> return file_node; } -/// \brief Create profobuf message DirectoryNode from Artifact::ObjectInfo +/// \brief Create protobuf message DirectoryNode from Artifact::ObjectInfo [[nodiscard]] auto CreateDirectoryNodeFromObjectInfo( std::string const& name, Artifact::ObjectInfo const& object_info) noexcept @@ -266,7 +266,7 @@ template <class T> return dir_node; } -/// \brief Create bundle for profobuf message DirectoryNode from Directory. +/// \brief Create bundle for protobuf message DirectoryNode from Directory. [[nodiscard]] auto CreateDirectoryNodeBundle(std::string const& dir_name, bazel_re::Directory const& dir) -> DirectoryNodeBundle::Ptr { @@ -311,7 +311,7 @@ template <class T> return CommandBundle::Create(msg, content_creator, digest_creator); } -/// \brief Create bundle for profobuf message Action from Command. +/// \brief Create bundle for protobuf message Action from Command. [[nodiscard]] auto CreateActionBundle( bazel_re::Digest const& command, bazel_re::Digest const& root_dir, diff --git a/src/buildtool/execution_api/remote/bazel/bazel_ac_client.hpp b/src/buildtool/execution_api/remote/bazel/bazel_ac_client.hpp index c9914e77..fd0e79cb 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_ac_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_ac_client.hpp @@ -25,7 +25,7 @@ #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/logging/logger.hpp" -/// Implements client side for serivce defined here: +/// Implements client side for service defined here: /// https://github.com/bazelbuild/bazel/blob/4b6ad34dbba15dacebfb6cbf76fa741649cdb007/third_party/remoteapis/build/bazel/remote/execution/v2/remote_execution.proto#L137 class BazelAcClient { public: diff --git a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp index bcf6df7e..23a7b4d8 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_cas_client.hpp @@ -57,7 +57,7 @@ class BazelCasClient { /// \param[in] instance_name Name of the CAS instance /// \param[in] begin Start of the blobs to upload /// \param[in] end End of the blobs to upload - /// \returns The digests of blobs sucessfully updated + /// \returns The digests of blobs successfully updated [[nodiscard]] auto BatchUpdateBlobs( std::string const& instance_name, std::vector<BazelBlob>::const_iterator const& begin, @@ -68,7 +68,7 @@ class BazelCasClient { /// \param[in] instance_name Name of the CAS instance /// \param[in] begin Start of the blobs to upload /// \param[in] end End of the blobs to upload - /// \returns The digests of blobs sucessfully updated + /// \returns The digests of blobs successfully updated [[nodiscard]] auto BatchUpdateBlobs( std::string const& instance_name, BlobContainer::iterator const& begin, @@ -79,7 +79,7 @@ class BazelCasClient { /// \param[in] instance_name Name of the CAS instance /// \param[in] begin Start of the blobs to upload /// \param[in] end End of the blobs to upload - /// \returns The digests of blobs sucessfully updated + /// \returns The digests of blobs successfully updated [[nodiscard]] auto BatchUpdateBlobs( std::string const& instance_name, BlobContainer::RelatedBlobList::iterator const& begin, diff --git a/src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp b/src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp index 480caf9c..a528eecb 100644 --- a/src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp +++ b/src/buildtool/execution_api/remote/bazel/bazel_execution_client.hpp @@ -26,7 +26,7 @@ #include "src/buildtool/execution_api/remote/config.hpp" #include "src/buildtool/logging/logger.hpp" -/// Implements client side for serivce defined here: +/// Implements client side for service defined here: /// https://github.com/bazelbuild/bazel/blob/4b6ad34dbba15dacebfb6cbf76fa741649cdb007/third_party/remoteapis/build/bazel/remote/execution/v2/remote_execution.proto#L42 class BazelExecutionClient { public: diff --git a/src/buildtool/execution_api/remote/config.hpp b/src/buildtool/execution_api/remote/config.hpp index 0d674220..b37e9f73 100644 --- a/src/buildtool/execution_api/remote/config.hpp +++ b/src/buildtool/execution_api/remote/config.hpp @@ -119,7 +119,7 @@ class RemoteExecutionConfig { // Server address of cache endpoint for rebuild. std::optional<ServerAddress> cache_address_{}; - // Platform properies for execution. + // Platform properties for execution. std::map<std::string, std::string> platform_properties_{}; [[nodiscard]] static auto ParseAddress(std::string const& address) noexcept diff --git a/src/buildtool/execution_engine/dag/dag.hpp b/src/buildtool/execution_engine/dag/dag.hpp index 171ea1d6..1a00f6a5 100644 --- a/src/buildtool/execution_engine/dag/dag.hpp +++ b/src/buildtool/execution_engine/dag/dag.hpp @@ -528,7 +528,7 @@ class DependencyGraph : DirectedAcyclicGraph { DependencyGraph() noexcept = default; - // DependencyGraph should not be copiable or movable. This could be changed + // DependencyGraph should not be copyable or movable. This could be changed // in the case we want to make the graph construction to be functional DependencyGraph(DependencyGraph const&) = delete; DependencyGraph(DependencyGraph&&) = delete; diff --git a/src/buildtool/execution_engine/traverser/traverser.hpp b/src/buildtool/execution_engine/traverser/traverser.hpp index 39852643..2567f3a4 100644 --- a/src/buildtool/execution_engine/traverser/traverser.hpp +++ b/src/buildtool/execution_engine/traverser/traverser.hpp @@ -66,7 +66,7 @@ class Traverser { // Traverse starting by the artifacts with the given identifiers, avoiding // executing actions that are not strictly needed to build the given - // artifacs + // artifacts [[nodiscard]] auto Traverse( std::unordered_set<ArtifactIdentifier> const& target_ids) noexcept -> bool; diff --git a/src/buildtool/multithreading/async_map_consumer.hpp b/src/buildtool/multithreading/async_map_consumer.hpp index c79f0964..3dcc0eff 100644 --- a/src/buildtool/multithreading/async_map_consumer.hpp +++ b/src/buildtool/multithreading/async_map_consumer.hpp @@ -40,8 +40,8 @@ using AsyncMapConsumerLoggerPtr = std::shared_ptr<AsyncMapConsumerLogger>; // ready. As template parameters, it takes the type that keys will have, the // type that their corresponding values will have and the type of the underlying // thread-safe associative container. The default thread-safe associative -// container is AsyncMap<Key, Value> and any substite must have the same public -// interface to be used in AsyncMapConsumer. +// container is AsyncMap<Key, Value> and any substitute must have the same +// public interface to be used in AsyncMapConsumer. template <typename Key, typename Value, typename Map = AsyncMap<Key, Value>> class AsyncMapConsumer { public: diff --git a/src/buildtool/multithreading/notification_queue.hpp b/src/buildtool/multithreading/notification_queue.hpp index 80b5ba92..1df5d659 100644 --- a/src/buildtool/multithreading/notification_queue.hpp +++ b/src/buildtool/multithreading/notification_queue.hpp @@ -149,7 +149,7 @@ class NotificationQueue { } // Method to communicate to the notification queue that there will not be - // any more queries. Queries after calling this method are not guaratied to + // any more queries. Queries after calling this method are not guarantied to // work as expected void done() { { diff --git a/src/other_tools/just_mr/main.cpp b/src/other_tools/just_mr/main.cpp index 8c238f71..8448b44b 100644 --- a/src/other_tools/just_mr/main.cpp +++ b/src/other_tools/just_mr/main.cpp @@ -572,7 +572,7 @@ void DefaultReachableRepositories( *arguments.common.just_mr_paths->workspace_root)) { Logger::Log( LogLevel::Warning, - "Writing distributiona files to workspace location {}, " + "Writing distribution files to workspace location {}, " "which is different to the workspace of the requested " "main repository {}.", fetch_dir->string(), diff --git a/src/utils/automata/dfa_minimizer.hpp b/src/utils/automata/dfa_minimizer.hpp index 3a2d56c3..617617e3 100644 --- a/src/utils/automata/dfa_minimizer.hpp +++ b/src/utils/automata/dfa_minimizer.hpp @@ -33,7 +33,7 @@ // they transition for the same symbol to two differently named non-existing // states. This is done for efficiency reasons, as we then can avoid creating an // additional bucket for non-existing states. This is sufficient for our use -// case, as we are only interested in the bisimiulation of states in complete +// case, as we are only interested in the bisimulation of states in complete // graphs. class DFAMinimizer { // Maps symbols to states diff --git a/test/buildtool/build_engine/expression/linked_map.test.cpp b/test/buildtool/build_engine/expression/linked_map.test.cpp index ecb36b92..358ac229 100644 --- a/test/buildtool/build_engine/expression/linked_map.test.cpp +++ b/test/buildtool/build_engine/expression/linked_map.test.cpp @@ -126,7 +126,7 @@ TEST_CASE("Zero copies", "[linked_map]") { for (int i{0}; i < kCount; ++i) { auto key = std::to_string(i); REQUIRE(map->contains(key)); - // underlaying map's initializer_list produces a single copy + // underlying map's initializer_list produces a single copy CHECK(map->at(key).Count() == 1); } } @@ -157,7 +157,7 @@ TEST_CASE("Zero copies", "[linked_map]") { } } - SECTION("Via underlaying map and emplace") { + SECTION("Via underlying map and emplace") { for (int i{0}; i < kCount; ++i) { map_t::underlying_map_t update{}; update.emplace(std::to_string(i), CopyCounter()); diff --git a/test/buildtool/multithreading/task.test.cpp b/test/buildtool/multithreading/task.test.cpp index 4d74b844..c39067ed 100644 --- a/test/buildtool/multithreading/task.test.cpp +++ b/test/buildtool/multithreading/task.test.cpp @@ -257,7 +257,7 @@ TEST_CASE("Task can be executed and doesn't steal contents", "[task]") { TEST_CASE("Task moving from named object can be executed", "[task]") { // Constructing Tasks from named objects using Task{std::move(named_object)} - // is only a way to explicitely express that the constructor from Task that + // is only a way to explicitly express that the constructor from Task that // will be called will treat `named_object` as an rvalue (temporary object). // We could accomplish the same by using `Task t{Type{args}};` where `Type` // is the type of the callable object. @@ -282,7 +282,7 @@ TEST_CASE("Task moving from named object can be executed", "[task]") { t_add_three(); // External data must have been affected by side effect but in this - // case `add_three` is a moved-from object so there is no guarrantee + // case `add_three` is a moved-from object so there is no guarantee // about the data it holds CHECK(num == initial_value + 3); } diff --git a/test/other_tools/git_operations/critical_git_ops.test.cpp b/test/other_tools/git_operations/critical_git_ops.test.cpp index 0e28e73e..04faa6b9 100644 --- a/test/other_tools/git_operations/critical_git_ops.test.cpp +++ b/test/other_tools/git_operations/critical_git_ops.test.cpp @@ -100,7 +100,7 @@ class TestUtilsMP { static inline std::atomic<int> counter = 0; }; -TEST_CASE("Crtitical git operations", "[critical_git_op_map]") { +TEST_CASE("Critical git operations", "[critical_git_op_map]") { // setup the repos needed auto prefix = TestUtilsMP::GetUniqueTestDir(); REQUIRE(prefix); diff --git a/test/other_tools/just_mr/create_test_archives.cpp b/test/other_tools/just_mr/create_test_archives.cpp index 031ca1ab..2f4327b7 100644 --- a/test/other_tools/just_mr/create_test_archives.cpp +++ b/test/other_tools/just_mr/create_test_archives.cpp @@ -98,7 +98,7 @@ auto main() -> int { // 1. move to correct directory { auto anchor = FileSystemManager::ChangeDirectory(tmp_dir->GetPath()); - // 2. create the archvies wrt to current directory + // 2. create the archives wrt to current directory std::optional<std::string> res{std::nullopt}; res = ArchiveOps::CreateArchive( ArchiveType::kArchiveTypeZip, "zip_repo.zip", "root"); |