diff --git a/CMakeLists.txt b/CMakeLists.txt index b441e3bdab94e..30bac316739fd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -289,7 +289,7 @@ if(NOT EXISTS "${CLANG_MAIN_INCLUDE_DIR}/clang/AST/Decl.h") endif() # This could be computed using ${CMAKE_CFG_INTDIR} if we want to link Swift -# against a mathing LLVM build configuration. However, we usually want to be +# against a matching LLVM build configuration. However, we usually want to be # flexible and allow linking a debug Swift against optimized LLVM. set(LLVM_RUNTIME_OUTPUT_INTDIR "${LLVM_BINARY_DIR}") set(LLVM_LIBRARY_OUTPUT_INTDIR "${LLVM_LIBRARY_DIR}") diff --git a/docs/IndexInvalidation.rst b/docs/IndexInvalidation.rst index 97dd1dc016d9c..26f809a0ef5e5 100644 --- a/docs/IndexInvalidation.rst +++ b/docs/IndexInvalidation.rst @@ -97,7 +97,7 @@ user: This rule does not imply that indices should be cheap to convert to actual integers. The offsets for consecutive elements could be non-consecutive (e.g., in a hash table with open addressing), or consist of multiple - offsets so that the conversion to an integer is non-trival (e.g., in a + offsets so that the conversion to an integer is non-trivial (e.g., in a tree). Note that this rule, like all other rules, is an "as if" rule. As long as