Skip to content

Commit 9e99a9b

Browse files
Use same cancelled spelling in doc and code.
Right thing might be to update the spelling in the code to follow American instead of English spelling, that is using only canceled. But they should at least be aligned.
1 parent 5983d37 commit 9e99a9b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

docs/dev/guide.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ changes "uniquely", but we might also want to fork an `Analysis` and send it to
4848
another thread for background processing. That is, there is only a single
4949
`AnalysisHost`, but there may be several (equivalent) `Analysis`.
5050

51-
Note that all of the `Analysis` API return `Cancelable<T>`. This is required to
51+
Note that all of the `Analysis` API return `Cancellable<T>`. This is required to
5252
be responsive in an IDE setting. Sometimes a long-running query is being computed
5353
and the user types something in the editor and asks for completion. In this
54-
case, we cancel the long-running computation (so it returns `Err(Canceled)`),
54+
case, we cancel the long-running computation (so it returns `Err(Cancelled)`),
5555
apply the change and execute request for completion. We never use stale data to
5656
answer requests. Under the cover, `AnalysisHost` "remembers" all outstanding
5757
`Analysis` instances. The `AnalysisHost::apply_change` method cancels all

0 commit comments

Comments
 (0)