2 files changed, 11 insertions, 2 deletions

diff --git a/docs/dev/style.md b/docs/dev/style.md
index 435de63e3..20f1b6253 100644
--- a/docs/dev/style.md
+++ b/docs/dev/style.md
@@ -248,6 +248,8 @@ fn frbonicate(f: impl AsRef<Path>) {
 
 # Premature Pessimization
 
+## Avoid Allocations
+
 Avoid writing code which is slower than it needs to be.
 Don't allocate a `Vec` where an iterator would do, don't allocate strings needlessly.
 
@@ -267,6 +269,8 @@ if words.len() != 2 {
 }
 ```
 
+## Push Allocations to the Call Site
+
 If allocation is inevitable, let the caller allocate the resource:
 
 ```rust
@@ -282,6 +286,9 @@ fn frobnicate(s: &str) {
 }
 ```
 
+This is better because it reveals the costs.
+It is also more efficient when the caller already owns the allocation.
+
 ## Collection types
 
 Prefer `rustc_hash::FxHashMap` and `rustc_hash::FxHashSet` instead of the ones in `std::collections`.
diff --git a/editors/code/src/inlay_hints.ts b/editors/code/src/inlay_hints.ts
index 30ade9b98..ed0db2924 100644
--- a/editors/code/src/inlay_hints.ts
+++ b/editors/code/src/inlay_hints.ts
@@ -44,10 +44,12 @@ const paramHints = createHintStyle("parameter");
 const chainingHints = createHintStyle("chaining");
 
 function createHintStyle(hintKind: "type" | "parameter" | "chaining") {
+    // U+200C is a zero-width non-joiner to prevent the editor from forming a ligature
+    // between code and type hints
     const [pos, render] = ({
-        type: ["after", (label: string) => `: ${label}`],
+        type: ["after", (label: string) => `\u{200c}: ${label}`],
         parameter: ["before", (label: string) => `${label}: `],
-        chaining: ["after", (label: string) => `: ${label}`],
+        chaining: ["after", (label: string) => `\u{200c}: ${label}`],
     } as const)[hintKind];
 
     const fg = new vscode.ThemeColor(`rust_analyzer.inlayHints.foreground.${hintKind}Hints`);