Merge pull request #2483 from input-output-hk/djo/rust_1.87

chore: anticipate rust `1.87`

Author: Alenar

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "client-cardano-database-v2"
 description = "Mithril client Cardano database example"
-version = "0.0.7"
+version = "0.0.8"
 authors = ["[email protected]", "[email protected]"]
 documentation = "https://mithril.network/doc"
 edition = "2021"

examples/client-cardano-database-v2/Cargo.toml

@@ -131,7 +131,7 @@ async fn main() -> MithrilResult<()> {
         )
         .await
     {
-        println!("Could not send usage statistics to the aggregator: {:?}", e);
+        println!("Could not send usage statistics to the aggregator: {e:?}");
     }
 
     println!(

examples/client-cardano-database-v2/src/main.rs

@@ -1,7 +1,7 @@
 [package]
 name = "client-cardano-database"
 description = "Mithril client Cardano database example"
-version = "0.1.32"
+version = "0.1.33"
 authors = ["[email protected]", "[email protected]"]
 documentation = "https://mithril.network/doc"
 edition = "2021"

examples/client-cardano-database/Cargo.toml

@@ -89,7 +89,7 @@ async fn main() -> MithrilResult<()> {
         .await?;
 
     if let Err(e) = client.cardano_database().add_statistics(&snapshot).await {
-        println!("Could not increment snapshot download statistics: {:?}", e);
+        println!("Could not increment snapshot download statistics: {e:?}");
     }
 
     println!("Computing snapshot '{}' message ...", snapshot.digest);
@@ -234,7 +234,7 @@ impl FeedbackReceiver for IndicatifFeedbackReceiver {
                 }
                 *certificate_validation_pb = None;
             }
-            _ => panic!("Unexpected event: {:?}", event),
+            _ => panic!("Unexpected event: {event:?}"),
         }
     }
 }

examples/client-cardano-database/src/main.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-build-script"
-version = "0.2.21"
+version = "0.2.22"
 description = "A toolbox for Mithril crates build scripts"
 authors = { workspace = true }
 edition = { workspace = true }

internal/mithril-build-script/Cargo.toml

@@ -286,17 +286,14 @@ pub fn extract_cardano_stake_distribution_epochs(
         .map(|content| {
             let json_value: serde_json::Value =
                 serde_json::from_str(content).unwrap_or_else(|err| {
-                    panic!(
-                        "Failed to parse JSON in csd content: {}\nError: {}",
-                        content, err
-                    );
+                    panic!("Failed to parse JSON in csd content: {content}\nError: {err}");
                 });
 
             json_value
                 .get("epoch")
                 .and_then(|epoch| epoch.as_u64().map(|s| s.to_string()))
                 .unwrap_or_else(|| {
-                    panic!("Epoch not found or invalid in csd content: {}", content);
+                    panic!("Epoch not found or invalid in csd content: {content}");
                 })
         })
         .collect()
@@ -327,33 +324,30 @@ pub fn generate_artifact_getter(
             artifacts_list,
             r###"
         (
-            "{}",
-            r#"{}"#
-        ),"###,
-            artifact_id, file_content
+            "{artifact_id}",
+            r#"{file_content}"#
+        ),"###
         )
         .unwrap();
     }
 
     format!(
-        r###"pub(crate) fn {}() -> BTreeMap<String, String> {{
-    [{}
+        r###"pub(crate) fn {fun_name}() -> BTreeMap<String, String> {{
+    [{artifacts_list}
     ]
     .into_iter()
     .map(|(k, v)| (k.to_owned(), v.to_owned()))
     .collect()
-}}"###,
-        fun_name, artifacts_list
+}}"###
     )
 }
 
 /// pub(crate) fn $fun_name() -> &'static str
 pub fn generate_list_getter(fun_name: &str, source_json: FileContent) -> String {
     format!(
-        r###"pub(crate) fn {}() -> &'static str {{
-    r#"{}"#
-}}"###,
-        fun_name, source_json
+        r###"pub(crate) fn {fun_name}() -> &'static str {{
+    r#"{source_json}"#
+}}"###
     )
 }
 
@@ -365,8 +359,7 @@ pub fn generate_ids_array(array_name: &str, ids: BTreeSet<ArtifactId>) -> String
         write!(
             ids_list,
             r#"
-        "{}","#,
-            id
+        "{id}","#
         )
         .unwrap();
     }

internal/mithril-build-script/src/fake_aggregator.rs

@@ -60,11 +60,10 @@ pub fn generate_open_api_versions_mapping(open_api_spec_files: &[PathBuf]) -> St
 /// Build Open API versions mapping
 pub fn get_open_api_versions_mapping() -> HashMap<OpenAPIFileName, semver::Version> {{
     HashMap::from([
-        {}
+        {open_api_versions_hashmap}
     ])
 }}
-        "#,
-        open_api_versions_hashmap
+        "#
     )
 }
 

internal/mithril-build-script/src/open_api.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-cli-helper"
-version = "0.0.5"
+version = "0.0.6"
 description = "An internal crate to provide tools for cli."
 authors = { workspace = true }
 edition = { workspace = true }

internal/mithril-cli-helper/Cargo.toml

@@ -142,7 +142,7 @@ mod tests {
             map,
             &"namespace".to_string(),
             fake.string_value,
-            |v: String| { format!("mapped_value from {}", v) }
+            |v: String| { format!("mapped_value from {v}") }
         );
 
         let expected = HashMap::from([(
@@ -200,7 +200,7 @@ mod tests {
             map,
             &"namespace".to_string(),
             fake.option_with_value,
-            |v: String| format!("mapped_value from {}", v)
+            |v: String| format!("mapped_value from {v}")
         );
         register_config_value_option!(map, &"namespace".to_string(), fake.option_none);
 

internal/mithril-cli-helper/src/source_config.rs

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-doc"
-version = "0.1.23"
+version = "0.1.24"
 description = "An internal crate to generate documentation."
 authors = { workspace = true }
 edition = { workspace = true }

internal/mithril-doc/Cargo.toml

@@ -5,8 +5,8 @@ use super::{FieldDoc, StructDoc};
 /// Extract information of an command line argument.
 fn extract_arg(arg: &Arg) -> FieldDoc {
     let parameter = arg.get_id().to_string();
-    let short_option = arg.get_short().map_or("".into(), |c| format!("-{}", c));
-    let long_option = arg.get_long().map_or("".into(), |c| format!("--{}", c));
+    let short_option = arg.get_short().map_or("".into(), |c| format!("-{c}"));
+    let long_option = arg.get_long().map_or("".into(), |c| format!("--{c}"));
     let env_variable = arg.get_env().map(|s| format!("{}", s.to_string_lossy()));
     let description = arg.get_help().map_or("-".into(), StyledStr::to_string);
     let default_value = if arg.get_default_values().iter().count() == 0 {

internal/mithril-doc/src/extract_clap_info.rs

@@ -158,19 +158,19 @@ pub struct GenerateDocCommands {
 impl GenerateDocCommands {
     fn save_doc(&self, cmd_name: &str, doc: &str) -> Result<(), String> {
         let output = if self.output.as_str() == DEFAULT_OUTPUT_FILE_TEMPLATE {
-            format!("{}-command-line.md", cmd_name)
+            format!("{cmd_name}-command-line.md")
         } else {
             self.output.clone()
         };
 
         match File::create(&output) {
             Ok(mut buffer) => {
-                if write!(buffer, "\n{}", doc).is_err() {
-                    return Err(format!("Error writing in {}", output));
+                if write!(buffer, "\n{doc}").is_err() {
+                    return Err(format!("Error writing in {output}"));
                 }
                 println!("Documentation generated in file `{}`", &output);
             }
-            _ => return Err(format!("Could not create {}", output)),
+            _ => return Err(format!("Could not create {output}")),
         };
         Ok(())
     }
@@ -190,7 +190,7 @@ impl GenerateDocCommands {
         let cmd_name = cmd_to_document.get_name();
 
         println!("Please note: the documentation generated is not able to indicate the environment variables used by the commands.");
-        self.save_doc(cmd_name, format!("\n{}", doc).as_str())
+        self.save_doc(cmd_name, format!("\n{doc}").as_str())
     }
 }