diff options
| -rw-r--r-- | doc/concepts/anonymous-targets.org | 8 | ||||
| -rw-r--r-- | doc/concepts/multi-repo.org | 4 | ||||
| -rw-r--r-- | doc/concepts/overview.org | 2 | ||||
| -rw-r--r-- | src/buildtool/build_engine/target_map/target_map.cpp | 4 | ||||
| -rw-r--r-- | src/buildtool/progress_reporting/progress.hpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/doc/concepts/anonymous-targets.org b/doc/concepts/anonymous-targets.org index 3b9046e4..5e9079e2 100644 --- a/doc/concepts/anonymous-targets.org +++ b/doc/concepts/anonymous-targets.org @@ -38,7 +38,7 @@ Actions are defined as Merkle-tree hash of the contents. As all components (input tree, list of output strings, command vector, environment, and cache pragma) are given by expressions, that can quickly be computed. This identifier also defines the notion of -equality for actions, and hence action artifacts. Recall that eqality +equality for actions, and hence action artifacts. Recall that equality of artifacts is also (implicitly) used in our notion of disjoint map union (where the set of keys does not have to be disjoint, as long as the values for all duplicate keys are equal). @@ -197,7 +197,7 @@ if defined at different places. This can be achieved by our usual approach for expressions of having cached Merkle-tree hashes and comparing them when an equality test is required. This efficient test for equality also allows using graph nodes as part of a map -key, e.g., for our asynchronous map conumers. +key, e.g., for our asynchronous map consumers. As a graph node can only be defined with all data given, the defined dependency structure is cycle-free by construction. However, the @@ -235,11 +235,11 @@ and ~"target_fields"~ be disjoint. Graph nodes are completely free of names and hence are eligible for exporting. As with other values, in the cache the intensional -definition of artifacts implict in them will be replaced by the +definition of artifacts implicit in them will be replaced by the corresponding, extensionally equal, known value. However, some care has to be taken in the serialisation that is -part of the caching, as we do not want to unfold the the dag to +part of the caching, as we do not want to unfold the dag to a tree. Therefore, we take as JSON serialisation a simple dict with ~"type"~ set to ~"NODE"~, and ~"value"~ set to the Merkle-tree hash. That serialisation respects intensional equality. To allow diff --git a/doc/concepts/multi-repo.org b/doc/concepts/multi-repo.org index 54ef6fb0..c0f7df15 100644 --- a/doc/concepts/multi-repo.org +++ b/doc/concepts/multi-repo.org @@ -107,7 +107,7 @@ For example, the invocation ~just build -C /etc/just/repos.conf baz~ tells our tool to build the target ~baz~ from the module the working directory is located in. ~foo~ will refer to the repository found at ~/opt/foobar/repo~ (using rules from ~/etc/just/rules~, -taking ~base~ refer to the the repository at ~/opt/barimpl~) and +taking ~base~ refer to the repository at ~/opt/barimpl~) and ~bar~ will refer to the repository at ~/opts/barimpl~. ** Naming of targets @@ -138,7 +138,7 @@ evaluating the parameters (for target fields) and in the evaluation of the defining expression when requesting properties of a target dependent upon (via ~DEP_ARTIFACTS~ and related functions). In the later case, however, the only legitimate way to obtain a target -name is by the the ~FIELD~ function. To enforce this behavior, and +name is by the ~FIELD~ function. To enforce this behavior, and to avoid problems with serializing target names, our expression language considers target names as opaque values. More precisely, - in a target description, the target fields are evaluated and the diff --git a/doc/concepts/overview.org b/doc/concepts/overview.org index 2799a2eb..13d5d04b 100644 --- a/doc/concepts/overview.org +++ b/doc/concepts/overview.org @@ -114,7 +114,7 @@ on multi-repository builds. In description files, targets, rules, and expressions are referred to by name. As the context always fixes if a name for a target, rule, or expression is expected, they use the same naming scheme. -- A single string refers to the the target with this name in the +- A single string refers to the target with this name in the same module. - A pair ~[module, name]~ refers to the target ~name~ in the module ~module~ of the same repository. There are no module names with diff --git a/src/buildtool/build_engine/target_map/target_map.cpp b/src/buildtool/build_engine/target_map/target_map.cpp index 4f4a087b..43d8be10 100644 --- a/src/buildtool/build_engine/target_map/target_map.cpp +++ b/src/buildtool/build_engine/target_map/target_map.cpp @@ -458,7 +458,7 @@ void withDependencies( if (rule->Tainted().find(entry->String()) == rule->Tainted().end()) { throw Evaluator::EvaluationError{ - fmt::format("may_fail contains entry {} the the rule " + fmt::format("may_fail contains entry {} the rule " "is not tainted with", entry->ToString())}; } @@ -491,7 +491,7 @@ void withDependencies( if (rule->Tainted().find(entry->String()) == rule->Tainted().end()) { throw Evaluator::EvaluationError{ - fmt::format("no_cache contains entry {} the the rule " + fmt::format("no_cache contains entry {} the rule " "is not tainted with", entry->ToString())}; } diff --git a/src/buildtool/progress_reporting/progress.hpp b/src/buildtool/progress_reporting/progress.hpp index 5940c880..5cc7e027 100644 --- a/src/buildtool/progress_reporting/progress.hpp +++ b/src/buildtool/progress_reporting/progress.hpp @@ -48,7 +48,7 @@ class Progress { } // Return a reference to the origin map. It is the responsibility - // of the caller to ensure that access happens only happens in a + // of the caller to ensure that access only happens in a // single-threaded context. auto OriginMap() -> std::unordered_map< std::string, |