From 2a1cd31d52b5614ee416b76fe7a91bc0dd3d3578 Mon Sep 17 00:00:00 2001 From: Starnick4444 Date: Tue, 1 Jul 2025 09:25:14 +0200 Subject: [PATCH] chore: finish migration to 2024 edition Closes #114 Removes the per-crate rustfmt configs, sets default edition to 2024. This should fix the formatting issues between some editors and CI. Change-Id: I9bb3a5f49f8ba2c8a616f29e87b7f8093187a165 Reviewed-on: https://cl.snix.dev/c/snix/+/30595 Autosubmit: Bence Nemes Tested-by: besadii Reviewed-by: Florian Klink --- contrib/crunch-v2/rustfmt.toml | 1 - contrib/fetchroots/rustfmt.toml | 1 - contrib/narinfo2parquet/rustfmt.toml | 1 - contrib/snixbolt/rustfmt.toml | 1 - contrib/turbofetch/rustfmt.toml | 1 - contrib/weave/rustfmt.toml | 1 - ops/gerrit-autosubmit/rustfmt.toml | 1 - rustfmt.toml | 3 ++- snix/build/rustfmt.toml | 2 -- snix/castore-http/rustfmt.toml | 2 -- snix/castore/rustfmt.toml | 2 -- snix/cli/rustfmt.toml | 2 -- snix/eval/builtin-macros/rustfmt.toml | 2 -- snix/eval/rustfmt.toml | 2 -- snix/glue/rustfmt.toml | 2 -- snix/nar-bridge/rustfmt.toml | 2 -- snix/nix-compat-derive-tests/rustfmt.toml | 2 -- snix/nix-compat-derive/rustfmt.toml | 2 -- snix/nix-compat/rustfmt.toml | 2 -- snix/nix-daemon/rustfmt.toml | 2 -- snix/serde/rustfmt.toml | 2 -- snix/store/rustfmt.toml | 2 -- snix/tracing/rustfmt.toml | 2 -- 23 files changed, 2 insertions(+), 38 deletions(-) delete mode 100644 contrib/crunch-v2/rustfmt.toml delete mode 100644 contrib/fetchroots/rustfmt.toml delete mode 100644 contrib/narinfo2parquet/rustfmt.toml delete mode 100644 contrib/snixbolt/rustfmt.toml delete mode 100644 contrib/turbofetch/rustfmt.toml delete mode 100644 contrib/weave/rustfmt.toml delete mode 100644 ops/gerrit-autosubmit/rustfmt.toml delete mode 100644 snix/build/rustfmt.toml delete mode 100644 snix/castore-http/rustfmt.toml delete mode 100644 snix/castore/rustfmt.toml delete mode 100644 snix/cli/rustfmt.toml delete mode 100644 snix/eval/builtin-macros/rustfmt.toml delete mode 100644 snix/eval/rustfmt.toml delete mode 100644 snix/glue/rustfmt.toml delete mode 100644 snix/nar-bridge/rustfmt.toml delete mode 100644 snix/nix-compat-derive-tests/rustfmt.toml delete mode 100644 snix/nix-compat-derive/rustfmt.toml delete mode 100644 snix/nix-compat/rustfmt.toml delete mode 100644 snix/nix-daemon/rustfmt.toml delete mode 100644 snix/serde/rustfmt.toml delete mode 100644 snix/store/rustfmt.toml delete mode 100644 snix/tracing/rustfmt.toml diff --git a/contrib/crunch-v2/rustfmt.toml b/contrib/crunch-v2/rustfmt.toml deleted file mode 100644 index f216078d9..000000000 --- a/contrib/crunch-v2/rustfmt.toml +++ /dev/null @@ -1 +0,0 @@ -edition = "2024" diff --git a/contrib/fetchroots/rustfmt.toml b/contrib/fetchroots/rustfmt.toml deleted file mode 100644 index f216078d9..000000000 --- a/contrib/fetchroots/rustfmt.toml +++ /dev/null @@ -1 +0,0 @@ -edition = "2024" diff --git a/contrib/narinfo2parquet/rustfmt.toml b/contrib/narinfo2parquet/rustfmt.toml deleted file mode 100644 index f216078d9..000000000 --- a/contrib/narinfo2parquet/rustfmt.toml +++ /dev/null @@ -1 +0,0 @@ -edition = "2024" diff --git a/contrib/snixbolt/rustfmt.toml b/contrib/snixbolt/rustfmt.toml deleted file mode 100644 index f216078d9..000000000 --- a/contrib/snixbolt/rustfmt.toml +++ /dev/null @@ -1 +0,0 @@ -edition = "2024" diff --git a/contrib/turbofetch/rustfmt.toml b/contrib/turbofetch/rustfmt.toml deleted file mode 100644 index f216078d9..000000000 --- a/contrib/turbofetch/rustfmt.toml +++ /dev/null @@ -1 +0,0 @@ -edition = "2024" diff --git a/contrib/weave/rustfmt.toml b/contrib/weave/rustfmt.toml deleted file mode 100644 index f216078d9..000000000 --- a/contrib/weave/rustfmt.toml +++ /dev/null @@ -1 +0,0 @@ -edition = "2024" diff --git a/ops/gerrit-autosubmit/rustfmt.toml b/ops/gerrit-autosubmit/rustfmt.toml deleted file mode 100644 index f216078d9..000000000 --- a/ops/gerrit-autosubmit/rustfmt.toml +++ /dev/null @@ -1 +0,0 @@ -edition = "2024" diff --git a/rustfmt.toml b/rustfmt.toml index 3a26366d4..28ead5702 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1 +1,2 @@ -edition = "2021" +# This file exists, because the CI depotfmt script calls rustfmt directly, instead of cargo fmt. +edition = "2024" diff --git a/snix/build/rustfmt.toml b/snix/build/rustfmt.toml deleted file mode 100644 index 4dfc1d2b7..000000000 --- a/snix/build/rustfmt.toml +++ /dev/null @@ -1,2 +0,0 @@ -# FUTUREWORK: move to .. once all crates are migrated (#114) -edition = "2024" diff --git a/snix/castore-http/rustfmt.toml b/snix/castore-http/rustfmt.toml deleted file mode 100644 index 4dfc1d2b7..000000000 --- a/snix/castore-http/rustfmt.toml +++ /dev/null @@ -1,2 +0,0 @@ -# FUTUREWORK: move to .. once all crates are migrated (#114) -edition = "2024" diff --git a/snix/castore/rustfmt.toml b/snix/castore/rustfmt.toml deleted file mode 100644 index 4dfc1d2b7..000000000 --- a/snix/castore/rustfmt.toml +++ /dev/null @@ -1,2 +0,0 @@ -# FUTUREWORK: move to .. once all crates are migrated (#114) -edition = "2024" diff --git a/snix/cli/rustfmt.toml b/snix/cli/rustfmt.toml deleted file mode 100644 index 4dfc1d2b7..000000000 --- a/snix/cli/rustfmt.toml +++ /dev/null @@ -1,2 +0,0 @@ -# FUTUREWORK: move to .. once all crates are migrated (#114) -edition = "2024" diff --git a/snix/eval/builtin-macros/rustfmt.toml b/snix/eval/builtin-macros/rustfmt.toml deleted file mode 100644 index 4dfc1d2b7..000000000 --- a/snix/eval/builtin-macros/rustfmt.toml +++ /dev/null @@ -1,2 +0,0 @@ -# FUTUREWORK: move to .. once all crates are migrated (#114) -edition = "2024" diff --git a/snix/eval/rustfmt.toml b/snix/eval/rustfmt.toml deleted file mode 100644 index 4dfc1d2b7..000000000 --- a/snix/eval/rustfmt.toml +++ /dev/null @@ -1,2 +0,0 @@ -# FUTUREWORK: move to .. once all crates are migrated (#114) -edition = "2024" diff --git a/snix/glue/rustfmt.toml b/snix/glue/rustfmt.toml deleted file mode 100644 index 4dfc1d2b7..000000000 --- a/snix/glue/rustfmt.toml +++ /dev/null @@ -1,2 +0,0 @@ -# FUTUREWORK: move to .. once all crates are migrated (#114) -edition = "2024" diff --git a/snix/nar-bridge/rustfmt.toml b/snix/nar-bridge/rustfmt.toml deleted file mode 100644 index 4dfc1d2b7..000000000 --- a/snix/nar-bridge/rustfmt.toml +++ /dev/null @@ -1,2 +0,0 @@ -# FUTUREWORK: move to .. once all crates are migrated (#114) -edition = "2024" diff --git a/snix/nix-compat-derive-tests/rustfmt.toml b/snix/nix-compat-derive-tests/rustfmt.toml deleted file mode 100644 index 4dfc1d2b7..000000000 --- a/snix/nix-compat-derive-tests/rustfmt.toml +++ /dev/null @@ -1,2 +0,0 @@ -# FUTUREWORK: move to .. once all crates are migrated (#114) -edition = "2024" diff --git a/snix/nix-compat-derive/rustfmt.toml b/snix/nix-compat-derive/rustfmt.toml deleted file mode 100644 index 4dfc1d2b7..000000000 --- a/snix/nix-compat-derive/rustfmt.toml +++ /dev/null @@ -1,2 +0,0 @@ -# FUTUREWORK: move to .. once all crates are migrated (#114) -edition = "2024" diff --git a/snix/nix-compat/rustfmt.toml b/snix/nix-compat/rustfmt.toml deleted file mode 100644 index 4dfc1d2b7..000000000 --- a/snix/nix-compat/rustfmt.toml +++ /dev/null @@ -1,2 +0,0 @@ -# FUTUREWORK: move to .. once all crates are migrated (#114) -edition = "2024" diff --git a/snix/nix-daemon/rustfmt.toml b/snix/nix-daemon/rustfmt.toml deleted file mode 100644 index 4dfc1d2b7..000000000 --- a/snix/nix-daemon/rustfmt.toml +++ /dev/null @@ -1,2 +0,0 @@ -# FUTUREWORK: move to .. once all crates are migrated (#114) -edition = "2024" diff --git a/snix/serde/rustfmt.toml b/snix/serde/rustfmt.toml deleted file mode 100644 index 4dfc1d2b7..000000000 --- a/snix/serde/rustfmt.toml +++ /dev/null @@ -1,2 +0,0 @@ -# FUTUREWORK: move to .. once all crates are migrated (#114) -edition = "2024" diff --git a/snix/store/rustfmt.toml b/snix/store/rustfmt.toml deleted file mode 100644 index 4dfc1d2b7..000000000 --- a/snix/store/rustfmt.toml +++ /dev/null @@ -1,2 +0,0 @@ -# FUTUREWORK: move to .. once all crates are migrated (#114) -edition = "2024" diff --git a/snix/tracing/rustfmt.toml b/snix/tracing/rustfmt.toml deleted file mode 100644 index 4dfc1d2b7..000000000 --- a/snix/tracing/rustfmt.toml +++ /dev/null @@ -1,2 +0,0 @@ -# FUTUREWORK: move to .. once all crates are migrated (#114) -edition = "2024"