more fixes

Author: psteinroe

rustfmt.toml

@@ -1,2 +1,2 @@
 newline_style = "Unix"
-edition = "2018"
+edition = "2024"

xtask/codegen/src/generate_configuration.rs

@@ -173,12 +173,12 @@ fn generate_for_groups(
     let use_rule_configuration = if kind == RuleCategory::Action {
         quote! {
             use crate::analyser::{RuleAssistConfiguration, RuleAssistPlainConfiguration};
-            use pglt_analyse::{options::RuleOptions, RuleFilter};
+            use pglt_analyse::{RuleFilter, options::RuleOptions};
         }
     } else {
         quote! {
             use crate::analyser::{RuleConfiguration, RulePlainConfiguration};
-            use pglt_analyse::{options::RuleOptions, RuleFilter};
+            use pglt_analyse::{RuleFilter, options::RuleOptions};
         }
     };
 

xtask/src/lib.rs

@@ -30,7 +30,7 @@ pub fn project_root() -> PathBuf {
 
 pub fn run_rustfmt(mode: Mode) -> Result<()> {
     let _dir = pushd(project_root());
-    let _e = pushenv("RUSTUP_TOOLCHAIN", "stable");
+    let _e = pushenv("RUSTUP_TOOLCHAIN", "nightly");
     ensure_rustfmt()?;
     match mode {
         Mode::Overwrite => run!("cargo fmt"),
@@ -55,7 +55,7 @@ pub fn prepend_generated_preamble(content: impl Display) -> String {
 }
 
 pub fn reformat_without_preamble(text: impl Display) -> Result<String> {
-    let _e = pushenv("RUSTUP_TOOLCHAIN", "stable");
+    let _e = pushenv("RUSTUP_TOOLCHAIN", "nightly");
     ensure_rustfmt()?;
     let output = run!(
         "rustfmt --config newline_style=Unix";
@@ -67,10 +67,10 @@ pub fn reformat_without_preamble(text: impl Display) -> Result<String> {
 
 pub fn ensure_rustfmt() -> Result<()> {
     let out = run!("rustfmt --version")?;
-    if !out.contains("stable") {
+    if !out.contains("nightly") {
         bail!(
-            "Failed to run rustfmt from toolchain 'stable'. \
-             Please run `rustup component add rustfmt --toolchain stable` to install it.",
+            "Failed to run rustfmt from toolchain 'nightly'. \
+             Please run `rustup component add rustfmt --toolchain nightly` to install it.",
         )
     }
     Ok(())