Fixes #22561: Update Rust tooling for 8.0

policies/Dockerfile

@@ -1,4 +1,4 @@
-FROM rust:1.66.1-bullseye
+FROM rust:1.68.2-bullseye
 
 ARG USER_ID=1000
 COPY ci/user.sh .

policies/rudder-module-type/src/cfengine/protocol.rs

@@ -34,20 +34,15 @@ impl FromStr for Class {
     }
 }
 
-#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone, Copy)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize, Clone, Copy, Default)]
 #[serde(rename_all = "lowercase")]
 pub(crate) enum ActionPolicy {
     #[serde(alias = "nop")]
     Warn,
+    #[default]
     Fix,
 }
 
-impl Default for ActionPolicy {
-    fn default() -> Self {
-        ActionPolicy::Fix
-    }
-}
-
 impl From<ActionPolicy> for PolicyMode {
     fn from(p: ActionPolicy) -> Self {
         match p {

policies/rudderc/src/ir/technique.rs

@@ -228,7 +228,7 @@ impl fmt::Display for BlockReporting {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
 pub enum BlockReportingMode {
     #[serde(rename = "worst-case-weighted-sum")]
     WorstCaseWeightedSum,
@@ -238,6 +238,7 @@ pub enum BlockReportingMode {
     Focus,
     #[serde(rename = "weighted")]
     #[serde(alias = "enabled")]
+    #[default]
     Weighted,
     #[serde(rename = "disabled")]
     Disabled,
@@ -259,22 +260,11 @@ impl fmt::Display for BlockReportingMode {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize, Default)]
 pub enum LeafReporting {
     #[serde(rename = "enabled")]
+    #[default]
     Enabled,
     #[serde(rename = "disabled")]
     Disabled,
 }
-
-impl Default for BlockReportingMode {
-    fn default() -> Self {
-        BlockReportingMode::Weighted
-    }
-}
-
-impl Default for LeafReporting {
-    fn default() -> Self {
-        LeafReporting::Enabled
-    }
-}

policies/rudderc/src/lib.rs

@@ -1,8 +1,10 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 // SPDX-FileCopyrightText: 2022 Normation SAS
 
-use std::fs::create_dir_all;
-use std::path::{Path, PathBuf};
+use std::{
+    fs::create_dir_all,
+    path::{Path, PathBuf},
+};
 
 use anyhow::{Context, Result};
 
@@ -80,12 +82,12 @@ pub fn run(args: MainArgs) -> Result<()> {
 
 // Actions
 pub mod action {
-    use std::process::Command;
     use std::{
         fs,
         fs::{create_dir, read_to_string, File},
         io::{self, Write},
         path::{Path, PathBuf},
+        process::Command,
     };
 
     use anyhow::{bail, Context, Result};

policies/rudderc/src/logs.rs

@@ -11,7 +11,7 @@ use colored::Colorize;
 use env_logger::fmt::{Color, Formatter, Style, StyledValue};
 use log::{info, Level, LevelFilter, Record};
 
-fn colored_level<'a>(style: &'a mut Style, level: Level) -> StyledValue<'a, &'static str> {
+fn colored_level(style: &mut Style, level: Level) -> StyledValue<&'static str> {
     match level {
         Level::Warn => style
             .set_color(Color::Yellow)

policies/rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.66.1"
+channel = "1.68.2"