From a7dcc116681c8d91274f5f993ddc384a166567b8 Mon Sep 17 00:00:00 2001 From: Loris Leiva Date: Tue, 30 Jul 2024 15:25:46 +0100 Subject: [PATCH] Use nightly toolchains to format and lint --- Cargo.toml | 4 ++-- rustfmt.toml | 15 +++++---------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index f7d811f..1cc067c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,5 +8,5 @@ solana = "2.0.1" # Specify Rust toolchains for rustfmt, clippy, and build. # Any unprovided toolchains default to stable. [workspace.metadata.toolchains] -format = "1.78.0" -lint = "1.78.0" +format = "nightly-2023-10-05" +lint = "nightly-2023-10-05" diff --git a/rustfmt.toml b/rustfmt.toml index 36789f4..838e219 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1,10 +1,5 @@ -max_width = 100 -reorder_imports = true -reorder_modules = true - -# == Nightly only. == -# imports_indent = "Block" -# imports_layout = "Mixed" -# imports_granularity = "Crate" -# group_imports = "Preserve" -# reorder_impl_items = false +comment_width = 80 +format_strings = true +group_imports = "One" +imports_granularity = "One" +wrap_comments = true