chore: Upgrade to 2024 edition

Author: epage

Cargo.toml

@@ -1,10 +1,10 @@
 [workspace]
-resolver = "2"
+resolver = "3"
 
 [workspace.package]
 repository = "https://github.com/rust-cli/config-rs"
 license = "MIT OR Apache-2.0"
-edition = "2018"
+edition = "2024"
 rust-version = "1.85.0"  # MSRV
 include = [
   "build.rs",

examples/async_source/main.rs

@@ -2,9 +2,9 @@ use std::{error::Error, fmt::Debug};
 
 use async_trait::async_trait;
 use config::{
-    builder::AsyncState, AsyncSource, ConfigBuilder, ConfigError, FileFormat, Format, Map,
+    AsyncSource, ConfigBuilder, ConfigError, FileFormat, Format, Map, builder::AsyncState,
 };
-use futures::{select, FutureExt};
+use futures::{FutureExt, select};
 use warp::Filter;
 
 // Example below presents sample configuration server and client.

examples/custom_file_format/main.rs

@@ -52,7 +52,7 @@ impl Format for PemFile {
                 return Err(Box::new(Error::new(
                     ErrorKind::InvalidData,
                     "PEM file did not contain a Private or Public key",
-                )))
+                )));
             }
         };
 

examples/env-list/main.rs

@@ -1,11 +1,12 @@
 use config::Config;
+
 #[derive(Debug, Default, serde::Deserialize, PartialEq, Eq)]
 struct AppConfig {
     list: Vec<String>,
 }
 
 fn main() {
-    std::env::set_var("APP_LIST", "Hello World");
+    // e.g. set `APP_LIST="Hello World"
 
     let config = Config::builder()
         .add_source(
@@ -20,6 +21,4 @@ fn main() {
     let app: AppConfig = config.try_deserialize().unwrap();
 
     assert_eq!(app.list, vec![String::from("Hello"), String::from("World")]);
-
-    std::env::remove_var("APP_LIST");
 }

examples/watch/main.rs

@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 use std::path::Path;
-use std::sync::mpsc::channel;
 use std::sync::OnceLock;
 use std::sync::RwLock;
+use std::sync::mpsc::channel;
 use std::time::Duration;
 
 use config::{Config, File};

src/de.rs

@@ -243,7 +243,7 @@ impl<'de> de::MapAccess<'de> for MapAccess {
     where
         K: de::DeserializeSeed<'de>,
     {
-        if let Some((ref key_s, _)) = self.elements.front() {
+        if let Some((key_s, _)) = self.elements.front() {
             let key_de = Value::new(None, key_s as &str);
             let key = de::DeserializeSeed::deserialize(seed, key_de)?;
 

src/env.rs

@@ -4,11 +4,11 @@ use std::ffi::OsString;
 #[cfg(feature = "convert-case")]
 use convert_case::{Case, Casing};
 
+use crate::ConfigError;
 use crate::error::Result;
 use crate::map::Map;
 use crate::source::Source;
 use crate::value::{Value, ValueKind};
-use crate::ConfigError;
 
 /// An environment source collects a dictionary of environment variables values into a hierarchical
 /// config Value type. We have to be aware how the config tree is created from the environment

src/file/format/corn.rs

@@ -1,5 +1,5 @@
-use crate::value::{Value, ValueKind};
-use crate::{format, Map};
+use crate::value::{Value, ValueKind};
+use crate::{Map, format};
 use std::error::Error;
 
 pub(crate) fn parse(

src/file/format/mod.rs

@@ -1,7 +1,7 @@
 use std::error::Error;
 
 use crate::map::Map;
-use crate::{file::FileStoredFormat, value::Value, Format};
+use crate::{Format, file::FileStoredFormat, value::Value};
 
 #[cfg(feature = "toml")]
 mod toml;

src/file/mod.rs

@@ -5,11 +5,11 @@ use std::fmt::Debug;
 use std::path::{Path, PathBuf};
 
 use self::source::FileSource;
+use crate::Format;
 use crate::error::{ConfigError, Result};
 use crate::map::Map;
 use crate::source::Source;
 use crate::value::Value;
-use crate::Format;
 
 pub use self::format::FileFormat;
 pub use self::source::file::FileSourceFile;