diff --git a/.github/workflows/nightly_release.yaml b/.github/workflows/nightly_release.yaml index 6c09b290dd6b..2019a6fc2c23 100644 --- a/.github/workflows/nightly_release.yaml +++ b/.github/workflows/nightly_release.yaml @@ -12,7 +12,7 @@ # # - Do some amount of testing prior to building and uploading the release. # - Tempting to try to examine existing testing workflow, but maybe better to -# allow re-using any complex parts and do our own testing. That would, for +# allow reusing any complex parts and do our own testing. That would, for # example, allow us to narrow or expand the set of tests uses for # pre-release testing to potentially be different from continuous testing. # - Some questions around what to do in the event of a failure... error? Where diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 1864e1413de6..07783c9137ac 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -45,7 +45,7 @@ repos: # Formatters should be run late so that they can re-format any prior changes. - repo: https://github.com/psf/black - rev: 1b2427a2b785cc4aac97c19bb4b9a0de063f9547 # frozen: 24.10.0 + rev: 8a737e727ac5ab2f1d4cf5876720ed276dc8dc4b # frozen: 25.1.0 hooks: - id: black - repo: local @@ -135,11 +135,11 @@ repos: files: ^.*/BUILD$ pass_filenames: false - repo: https://github.com/PyCQA/flake8 - rev: e43806be3607110919eff72939fda031776e885a # frozen: 7.1.1 + rev: bddd87797f8dfc07d2a10c894776018d9bec590b # frozen: 7.1.2 hooks: - id: flake8 - repo: https://github.com/pre-commit/mirrors-mypy - rev: 'f56614daa94d5cd733d3b7004c5df9caad267b4a' # frozen: v1.13.0 + rev: 'f40886d54c729f533f864ed6ce584e920feb0af7' # frozen: v1.15.0 hooks: - id: mypy # Use setup.cfg to match the command line. @@ -161,7 +161,7 @@ repos: .*_test\.py )$ - repo: https://github.com/codespell-project/codespell - rev: 193cd7d27cd571f79358af09a8fb8997e54f8fff # frozen: v2.3.0 + rev: 63c8f8312b7559622c0d82815639671ae42132ac # frozen: v2.4.1 hooks: - id: codespell args: ['-I', '.codespell_ignore', '--uri-ignore-words-list', '*'] diff --git a/common/raw_hashtable.h b/common/raw_hashtable.h index 959c23db8c4b..ace1e3a50799 100644 --- a/common/raw_hashtable.h +++ b/common/raw_hashtable.h @@ -518,7 +518,7 @@ class BaseImpl { // returns `true`. If not found, returns `false`. // // Does not release any memory, just leaves a tombstone behind so this entry - // cannot be found and the slot can in theory be re-used. + // cannot be found and the slot can in theory be reused. template auto EraseImpl(LookupKeyT lookup_key, KeyContextT key_context) -> bool; diff --git a/proposals/p0253.md b/proposals/p0253.md index 631353f0d854..41b678f8f02b 100644 --- a/proposals/p0253.md +++ b/proposals/p0253.md @@ -52,7 +52,7 @@ semantically meaningful port into Carbon code. An important nuance of this goal is that it doesn't include building a complete Carbon standard library beyond the most basic necessary types. The intent is to -exercise and show the interoperability layers of Carbon by re-using the C++ +exercise and show the interoperability layers of Carbon by reusing the C++ standard library in many cases and exporting a compatible C++ API to both woff2 and RE2's current API. diff --git a/proposals/p0257.md b/proposals/p0257.md index d631ef53a06c..fafde9c223e9 100644 --- a/proposals/p0257.md +++ b/proposals/p0257.md @@ -203,7 +203,7 @@ implement it) alongside raw storage for the underlying object. The unformed state can have the same representation as valid and fully formed states for the object (for example, an empty `Optional(T)`). While there is a semantic difference (any operation _other_ than assignment and destruction is an -error for an unformed object), there is no problem re-using a representation +error for an unformed object), there is no problem reusing a representation which is also used for fully formed and valid objects provided it satisfies all three of the above constraints. The semantic restrictions remain even in this case. Using the hypothetical `Optional(T)` API, we could imagine: diff --git a/proposals/p2006.md b/proposals/p2006.md index 4c9ac39e4eb9..501045a2dbb3 100644 --- a/proposals/p2006.md +++ b/proposals/p2006.md @@ -685,7 +685,7 @@ outweighing the proposed option on balance. - `const` and `var` - Some familiarity for C++ developers given the use of `const` there. - `const` is used by other languages in a similar way to Carbon's `let`. - - However, very concerned about re-using `const` but having it mean + - However, very concerned about reusing `const` but having it mean something fairly different from C++ as a declaration introducer. For example, nesting a `var` pattern within `const` might be especially surprising. diff --git a/proposals/p3833.md b/proposals/p3833.md index aa1cc9a7d7ce..6b83b88d88b0 100644 --- a/proposals/p3833.md +++ b/proposals/p3833.md @@ -153,10 +153,10 @@ the full semantic modeling here: - Not representing a user-written `typeof` style expression to compute the type, or duplicating the `y` expression. -- Caching and re-using SemIR for immutable things like successfully resolved - name lookup. Concretely, re-using a single cached lookup of +- Caching and reusing SemIR for immutable things like successfully resolved + name lookup. Concretely, reusing a single cached lookup of `package#Core.AddWith` would still provide the full model. And similarly, - re-using an already computed parameterization such as + reusing an already computed parameterization such as `package#Core.AddWith(i32)` repeatedly, and the lookup of `Op` within that parameterization.