about summary refs log tree commit diff
path: root/docs/dev
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2024-02-02 12:02:48 +0000
committerbors <bors@rust-lang.org>2024-02-02 12:02:48 +0000
commit8f6a72871ec87ed53cfe43a09fb284168a284e7e (patch)
treea17e23cfc8cd71c255d3dac4faa05a03afb42167 /docs/dev
parent980d34811141286a22aabf5a6ef331db2386fae7 (diff)
parenta52a4d9ba444b240e913db4effd9faf81c58b242 (diff)
downloadrust-8f6a72871ec87ed53cfe43a09fb284168a284e7e.tar.gz
rust-8f6a72871ec87ed53cfe43a09fb284168a284e7e.zip
Auto merge of #16469 - Young-Flash:ci_typos, r=lnicola
internal: add typos check CI (part 2)

follow up https://github.com/rust-lang/rust-analyzer/pull/16448
Diffstat (limited to 'docs/dev')
-rw-r--r--docs/dev/lsp-extensions.md4
-rw-r--r--docs/dev/style.md9
2 files changed, 3 insertions, 10 deletions
diff --git a/docs/dev/lsp-extensions.md b/docs/dev/lsp-extensions.md
index 3251dd75268..bc558c20247 100644
--- a/docs/dev/lsp-extensions.md
+++ b/docs/dev/lsp-extensions.md
@@ -239,13 +239,13 @@ The primary goal of `onEnter` is to handle automatic indentation when opening a
 This is not yet implemented.
 The secondary goal is to handle fixing up syntax, like continuing doc strings and comments, and escaping `\n` in string literals.
 
-As proper cursor positioning is raison-d'etat for `onEnter`, it uses `SnippetTextEdit`.
+As proper cursor positioning is raison d'ĂȘtre for `onEnter`, it uses `SnippetTextEdit`.
 
 ### Unresolved Question
 
 * How to deal with synchronicity of the request?
   One option is to require the client to block until the server returns the response.
-  Another option is to do a OT-style merging of edits from client and server.
+  Another option is to do a operational transforms style merging of edits from client and server.
   A third option is to do a record-replay: client applies heuristic on enter immediately, then applies all user's keypresses.
   When the server is ready with the response, the client rollbacks all the changes and applies the recorded actions on top of the correct response.
 * How to deal with multiple carets?
diff --git a/docs/dev/style.md b/docs/dev/style.md
index 786127639ce..4c5299bde3e 100644
--- a/docs/dev/style.md
+++ b/docs/dev/style.md
@@ -99,14 +99,7 @@ Including a description and GIF suitable for the changelog means less work for t
 
 ## Clippy
 
-We don't enforce Clippy.
-A number of default lints have high false positive rate.
-Selectively patching false-positives with `allow(clippy)` is probably worse than entirely disabling a problematic lint.
-There's a `cargo lint` command which runs a subset of low-FPR lints.
-Careful tweaking of `lint` is welcome.
-Of course, applying Clippy suggestions is welcome as long as they indeed improve the code.
-
-**Rationale:** see [rust-lang/clippy#5537](https://github.com/rust-lang/rust-clippy/issues/5537).
+We use Clippy to improve the code, but if some lints annoy you, allow them in the [Cargo.toml](../../Cargo.toml) [workspace.lints.clippy] section.
 
 # Code