From 9e99a9b860f4def4f4c2fc2747b987cc66f12ed1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20Gr=C3=B6nlund?= Date: Sun, 25 Jul 2021 23:12:28 +0200 Subject: [PATCH] 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. --- docs/dev/guide.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/dev/guide.md b/docs/dev/guide.md index c1a55c56c1..098f5dccb2 100644 --- a/docs/dev/guide.md +++ b/docs/dev/guide.md @@ -48,10 +48,10 @@ changes "uniquely", but we might also want to fork an `Analysis` and send it to another thread for background processing. That is, there is only a single `AnalysisHost`, but there may be several (equivalent) `Analysis`. -Note that all of the `Analysis` API return `Cancelable`. This is required to +Note that all of the `Analysis` API return `Cancellable`. This is required to be responsive in an IDE setting. Sometimes a long-running query is being computed and the user types something in the editor and asks for completion. In this -case, we cancel the long-running computation (so it returns `Err(Canceled)`), +case, we cancel the long-running computation (so it returns `Err(Cancelled)`), apply the change and execute request for completion. We never use stale data to answer requests. Under the cover, `AnalysisHost` "remembers" all outstanding `Analysis` instances. The `AnalysisHost::apply_change` method cancels all