From 42f3410b5b78e5ce7f3ce7e1fdd8a33000a48817 Mon Sep 17 00:00:00 2001
From: elkowar <5300871+elkowar@users.noreply.github.com>
Date: Sat, 17 Feb 2024 14:14:46 +0100
Subject: [PATCH] Remove nightly options from rustfmt.toml

---
 crates/eww/rustfmt.toml       | 14 --------------
 crates/simplexpr/rustfmt.toml | 14 --------------
 crates/yuck/rustfmt.toml      | 14 --------------
 rustfmt.toml                  | 29 ++++++++++++++++-------------
 4 files changed, 16 insertions(+), 55 deletions(-)
 delete mode 100644 crates/eww/rustfmt.toml
 delete mode 100644 crates/simplexpr/rustfmt.toml
 delete mode 100644 crates/yuck/rustfmt.toml

diff --git a/crates/eww/rustfmt.toml b/crates/eww/rustfmt.toml
deleted file mode 100644
index 824c011..0000000
--- a/crates/eww/rustfmt.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-unstable_features = true
-fn_single_line = false
-max_width = 130
-reorder_impl_items = true
-imports_granularity = "Crate"
-normalize_comments = true
-use_field_init_shorthand = true
-#wrap_comments = true
-combine_control_expr = false
-condense_wildcard_suffixes = true
-format_code_in_doc_comments = true
-format_macro_matchers = true
-format_strings = true
-use_small_heuristics = "Max"
diff --git a/crates/simplexpr/rustfmt.toml b/crates/simplexpr/rustfmt.toml
deleted file mode 100644
index 824c011..0000000
--- a/crates/simplexpr/rustfmt.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-unstable_features = true
-fn_single_line = false
-max_width = 130
-reorder_impl_items = true
-imports_granularity = "Crate"
-normalize_comments = true
-use_field_init_shorthand = true
-#wrap_comments = true
-combine_control_expr = false
-condense_wildcard_suffixes = true
-format_code_in_doc_comments = true
-format_macro_matchers = true
-format_strings = true
-use_small_heuristics = "Max"
diff --git a/crates/yuck/rustfmt.toml b/crates/yuck/rustfmt.toml
deleted file mode 100644
index 824c011..0000000
--- a/crates/yuck/rustfmt.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-unstable_features = true
-fn_single_line = false
-max_width = 130
-reorder_impl_items = true
-imports_granularity = "Crate"
-normalize_comments = true
-use_field_init_shorthand = true
-#wrap_comments = true
-combine_control_expr = false
-condense_wildcard_suffixes = true
-format_code_in_doc_comments = true
-format_macro_matchers = true
-format_strings = true
-use_small_heuristics = "Max"
diff --git a/rustfmt.toml b/rustfmt.toml
index 824c011..b2b08e3 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,14 +1,17 @@
-unstable_features = true
-fn_single_line = false
-max_width = 130
-reorder_impl_items = true
-imports_granularity = "Crate"
-normalize_comments = true
-use_field_init_shorthand = true
-#wrap_comments = true
-combine_control_expr = false
-condense_wildcard_suffixes = true
-format_code_in_doc_comments = true
-format_macro_matchers = true
-format_strings = true
 use_small_heuristics = "Max"
+max_width = 130
+use_field_init_shorthand = true
+
+# these where set when we where still on nightly
+
+# unstable_features = true
+# fn_single_line = false
+# reorder_impl_items = true
+# imports_granularity = "Crate"
+# normalize_comments = true
+# wrap_comments = true
+# combine_control_expr = false
+# condense_wildcard_suffixes = true
+# format_code_in_doc_comments = true
+# format_macro_matchers = true
+# format_strings = true