From 7de85a1eebcf4695c3a04298eaad996618a0257d Mon Sep 17 00:00:00 2001 From: marshmallow Date: Sun, 7 Jun 2026 12:41:35 +1000 Subject: [PATCH] enable default_field_values --- crates/cli/src/cli.rs | 15 +++------------ crates/cli/src/main.rs | 1 + crates/core/src/lib.rs | 14 ++++++-------- 3 files changed, 10 insertions(+), 20 deletions(-) diff --git a/crates/cli/src/cli.rs b/crates/cli/src/cli.rs index 31a2516..b6b7c0d 100644 --- a/crates/cli/src/cli.rs +++ b/crates/cli/src/cli.rs @@ -229,19 +229,10 @@ pub struct ApplyArgs { pub ssh_verbose: u8, } -#[derive(Clone, Debug)] +#[derive(Clone, Debug, Default)] pub struct Partitions { - pub current: usize, - pub maximum: usize, -} - -impl Default for Partitions { - fn default() -> Self { - Self { - current: 1, - maximum: 1, - } - } + pub current: usize = 1, + pub maximum: usize = 1, } #[derive(Args)] diff --git a/crates/cli/src/main.rs b/crates/cli/src/main.rs index c6efd23..207e10b 100644 --- a/crates/cli/src/main.rs +++ b/crates/cli/src/main.rs @@ -2,6 +2,7 @@ // Copyright 2024-2025 wire Contributors #![deny(clippy::pedantic)] +#![feature(default_field_values)] use std::process::Command; use std::sync::Arc; diff --git a/crates/core/src/lib.rs b/crates/core/src/lib.rs index c3cc8e9..3eee9c1 100644 --- a/crates/core/src/lib.rs +++ b/crates/core/src/lib.rs @@ -4,6 +4,7 @@ #![feature(iter_intersperse)] #![feature(sync_nonpoison)] #![feature(nonpoison_mutex)] +#![feature(default_field_values)] use std::{ collections::{HashMap, HashSet}, @@ -56,23 +57,20 @@ pub enum StrictHostKeyChecking { #[derive(Debug, Clone, Copy)] #[allow(clippy::struct_excessive_bools)] pub struct SubCommandModifiers { - pub show_trace: bool, + pub show_trace: bool = false, pub non_interactive: bool, pub ssh_accept_host: StrictHostKeyChecking, - pub ssh_verbosity: usize, - pub print_build_logs: bool, - pub experimental_nix_client: bool, + pub ssh_verbosity: usize = 0, + pub print_build_logs: bool = false, + pub experimental_nix_client: bool = false, } impl Default for SubCommandModifiers { fn default() -> Self { Self { - show_trace: false, non_interactive: !std::io::stdin().is_terminal(), ssh_accept_host: StrictHostKeyChecking::default(), - ssh_verbosity: 0, - print_build_logs: false, - experimental_nix_client: false, + .. } } } -- 2.51.2