Update to 2024 edition (#1076)

Author: jeffcharles

Cargo.toml

@@ -18,7 +18,7 @@ resolver = "2"
 [workspace.package]
 version = "7.0.1"
 authors = ["The Javy Project Developers"]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0 WITH LLVM-exception"
 
 [workspace.dependencies]

crates/cli/src/commands.rs

@@ -1,21 +1,22 @@
 use crate::{
+    CliPlugin, WitOptions,
     js_config::{ConfigSchema, JsConfig},
     option::OptionMeta,
-    option_group, CliPlugin, WitOptions,
+    option_group,
 };
-use anyhow::{anyhow, bail, Result};
+use anyhow::{Result, anyhow, bail};
 use clap::{
+    CommandFactory, Parser, Subcommand,
     builder::{StringValueParser, TypedValueParser, ValueParserFactory},
     error::ErrorKind,
-    CommandFactory, Parser, Subcommand,
 };
 use std::{
     collections::{HashMap, HashSet},
     path::PathBuf,
 };
 
 use crate::option::{
-    fmt_help, GroupDescriptor, GroupOption, GroupOptionBuilder, GroupOptionParser, OptionValue,
+    GroupDescriptor, GroupOption, GroupOptionBuilder, GroupOptionParser, OptionValue, fmt_help,
 };
 
 #[derive(Debug, Parser)]
@@ -378,10 +379,10 @@ mod tests {
     use std::path::PathBuf;
 
     use crate::{
+        CliPlugin, Plugin, PluginKind,
         commands::{JsGroupOption, JsGroupValue, Source},
         js_config::JsConfig,
         plugin::PLUGIN_MODULE,
-        CliPlugin, Plugin, PluginKind,
     };
 
     use super::{CodegenOption, CodegenOptionGroup, GroupOption};

crates/cli/src/js_config.rs

@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use serde::Deserialize;
 use std::{collections::HashMap, str};
 use wasmtime::{AsContext, AsContextMut, Engine, Linker};

crates/cli/src/main.rs

@@ -8,9 +8,9 @@ use anyhow::Result;
 use clap::Parser;
 
 use commands::CodegenOptionGroup;
-use javy_codegen::{Generator, LinkingKind, Plugin, SourceEmbedding, WitOptions, JS};
+use javy_codegen::{Generator, JS, LinkingKind, Plugin, SourceEmbedding, WitOptions};
 use js_config::JsConfig;
-use plugin::{CliPlugin, PluginKind, UninitializedPlugin, PLUGIN_MODULE};
+use plugin::{CliPlugin, PLUGIN_MODULE, PluginKind, UninitializedPlugin};
 use std::fs;
 use std::fs::File;
 use std::io::Write;

crates/cli/src/option.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use std::path::PathBuf;
 
 use crate::commands;

crates/cli/src/plugin.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use javy_codegen::Plugin;
 
 pub const PLUGIN_MODULE: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/plugin.wasm"));

crates/cli/tests/dynamic_linking_test.rs

@@ -48,11 +48,12 @@ fn test_errors_in_exported_functions_are_correctly_reported(builder: &mut Builde
 
     let res = runner.exec_func("foo", vec![]);
 
-    assert!(res
-        .err()
-        .unwrap()
-        .to_string()
-        .contains("error while executing"));
+    assert!(
+        res.err()
+            .unwrap()
+            .to_string()
+            .contains("error while executing")
+    );
     Ok(())
 }
 
@@ -79,9 +80,10 @@ fn test_producers_section_present(builder: &mut Builder) -> Result<()> {
 #[javy_cli_test(dyn = true, root = "tests/dynamic-linking-scripts")]
 fn test_using_runtime_flag_with_dynamic_triggers_error(builder: &mut Builder) -> Result<()> {
     let build_result = builder.input("console.js").text_encoding(false).build();
-    assert!(build_result.is_err_and(|e| e
-        .to_string()
-        .contains("error: Property text-encoding is not supported for runtime configuration")));
+    assert!(build_result.is_err_and(|e| {
+        e.to_string()
+            .contains("error: Property text-encoding is not supported for runtime configuration")
+    }));
     Ok(())
 }
 

crates/cli/tests/integration_test.rs

@@ -1,4 +1,4 @@
-use anyhow::{bail, Result};
+use anyhow::{Result, bail};
 use javy_runner::{Builder, Plugin, Runner, RunnerError, Source};
 use std::{io::Read, path::PathBuf, process::Command, str};
 use wasmtime::{AsContextMut, Engine, Linker, Module, Store};
@@ -150,9 +150,10 @@ fn test_using_wasip1_plugin_with_static_build_fails_with_runtime_config(
         .simd_json_builtins(true)
         .build();
     let err = result.err().unwrap();
-    assert!(err
-        .to_string()
-        .contains("Property simd-json-builtins is not supported for runtime configuration"));
+    assert!(
+        err.to_string()
+            .contains("Property simd-json-builtins is not supported for runtime configuration")
+    );
 
     Ok(())
 }
@@ -166,9 +167,10 @@ fn test_using_wasip2_plugin_with_static_build_fails_with_runtime_config(
         .simd_json_builtins(true)
         .build();
     let err = result.err().unwrap();
-    assert!(err
-        .to_string()
-        .contains("Property simd-json-builtins is not supported for runtime configuration"));
+    assert!(
+        err.to_string()
+            .contains("Property simd-json-builtins is not supported for runtime configuration")
+    );
 
     Ok(())
 }

crates/codegen/src/bytecode.rs

@@ -1,4 +1,4 @@
-use anyhow::{anyhow, bail, Result};
+use anyhow::{Result, anyhow, bail};
 use wasmtime::{AsContext, AsContextMut, Engine, Instance, Linker, Memory, Module, Store};
 
 use crate::Plugin;

crates/codegen/src/exports.rs

@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Result};
+use anyhow::{Result, anyhow};
 use convert_case::{Case, Casing};
 use std::path::Path;