From 9c56e7f4ee3e1833866262fec1a5ddcd62acbb48 Mon Sep 17 00:00:00 2001
From: Quentin Gliech <quenting@element.io>
Date: Thu, 3 Sep 2026 19:16:19 +0200
Subject: [PATCH] Stop wrapping comments in rustfmt, drop redundant options

`comment_width = 80` counts the whole line, indentation included, which
wraps far more aggressively than intended; the latest nightly rustfmt
(rust-lang/rustfmt#6802) started enforcing it on comments it previously
left alone. Turn `wrap_comments` off rather than reformat everything.

`max_width = 100`, `comment_width = 80` and `use_small_heuristics =
"Default"` are rustfmt's defaults, so drop them too; only the two
nightly-only import options remain.
---
 .rustfmt.toml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/.rustfmt.toml b/.rustfmt.toml
index 72a97f569..aee976484 100644
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -1,11 +1,8 @@
+# Copyright 2025, 2026 Element Creations Ltd.
 # Copyright 2025 New Vector Ltd.
 #
 # SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
 # Please see LICENSE files in the repository root for full details.
 
-max_width = 100
-comment_width = 80
-wrap_comments = true
 imports_granularity = "Crate"
-use_small_heuristics = "Default"
 group_imports = "StdExternalCrate"