From 0e34a8080f00f73e8f894cc3ba519d5f89f72008 Mon Sep 17 00:00:00 2001
From: Bernhard Schuster <bernhard@ahoi.io>
Date: Mon, 21 Mar 2022 14:00:59 +0100
Subject: [PATCH] miniscule: fix edition fmt (#5167)

* miniscule: fix edition fmt

* fix: rust analyzer might enable this and hence cause red squiggles

Reduce the visual overload.

* fix/spellcheck/quirk: allow 124_123 numbers
---
 polkadot/node/gum/proc-macro/src/lib.rs        |  5 ++++-
 .../overseer-gen/proc-macro/src/lib.rs         |  2 +-
 polkadot/scripts/gitlab/spellcheck.toml        | 18 +++++++++++++++---
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/polkadot/node/gum/proc-macro/src/lib.rs b/polkadot/node/gum/proc-macro/src/lib.rs
index f513e25e3a..374ccaec37 100644
--- a/polkadot/node/gum/proc-macro/src/lib.rs
+++ b/polkadot/node/gum/proc-macro/src/lib.rs
@@ -67,7 +67,10 @@ pub(crate) fn gum(item: proc_macro::TokenStream, level: Level) -> proc_macro::To
 
 	let res = expander::Expander::new("gum")
 		.add_comment("Generated overseer code by `gum::warn!(..)`".to_owned())
-		.dry(!cfg!(feature = "expand"))
+		// `dry=true` until rust-analyzer can selectively disable features so it's
+		// not all red squiggles. Originally: `!cfg!(feature = "expand")`
+		// ISSUE: <https://github.com/rust-analyzer/rust-analyzer/issues/11777>
+		.dry(true)
 		.verbose(false)
 		.fmt(expander::Edition::_2021)
 		.maybe_write_to_out_dir(impl_gum2(item, level))
diff --git a/polkadot/node/overseer/overseer-gen/proc-macro/src/lib.rs b/polkadot/node/overseer/overseer-gen/proc-macro/src/lib.rs
index 6065a0a3cf..a0275e3e79 100644
--- a/polkadot/node/overseer/overseer-gen/proc-macro/src/lib.rs
+++ b/polkadot/node/overseer/overseer-gen/proc-macro/src/lib.rs
@@ -102,7 +102,7 @@ pub(crate) fn impl_overseer_gen(
 		.add_comment("Generated overseer code by `#[overlord(..)]`".to_owned())
 		.dry(!cfg!(feature = "expand"))
 		.verbose(false)
-		.fmt(expander::Edition::_2018)
+		.fmt(expander::Edition::_2021)
 		.write_to_out_dir(additive)
 		.expect("Expander does not fail due to IO in OUT_DIR. qed");
 
diff --git a/polkadot/scripts/gitlab/spellcheck.toml b/polkadot/scripts/gitlab/spellcheck.toml
index 57c635f09a..025c7a0a46 100644
--- a/polkadot/scripts/gitlab/spellcheck.toml
+++ b/polkadot/scripts/gitlab/spellcheck.toml
@@ -6,10 +6,22 @@ skip_os_lookups = true
 use_builtin = true
 
 [hunspell.quirks]
-# `Type`'s
-# 5x
 # He tagged it as 'TheGreatestOfAllTimes'
+transform_regex = [
+# `Type`'s
+	"^'([^\\s])'$",
+# 5x
+# 10.7%
+	"^[0-9_]+(?:\\.[0-9]*)?(x|%)$",
 # Transforms'
-transform_regex = ["^'([^\\s])'$", "^[0-9]+(?:\\.[0-9]*)?(x|%)$", "^(.*)'$", "^\\+$", "^[0-9]*+k|MB|Mb|ms|Mbit|nd|th|rd$", "^=|>|<|%$"]
+	"^(.*)'$",
+# backslashes
+	"^\\+$",
+	"^[0-9]*+k|MB|Mb|ms|Mbit|nd|th|rd$",
+# single char `=` `>` `%` ..
+	"^=|>|<|%$",
+# 22_100
+	"^(?:[0-9]+_)+[0-9]+$"
+]
 allow_concatenation = true
 allow_dashes = true