refactor(core): apply widespread updates and fixes across WRT modules

Author: avrabe

example/build.rs

@@ -1,5 +1,4 @@
-use std::fs;
-use std::path::Path;
+use std::{fs, path::Path};
 
 fn main() {
     // Tell Cargo to rerun this build script if the WIT files change

example/src/lib.rs

@@ -5,6 +5,7 @@
 #![warn(clippy::missing_panics_doc)]
 
 use std::cell::{Cell, RefCell};
+
 use wit_bindgen::generate;
 
 generate!({

test-control-instructions/src/tests.rs

@@ -7,11 +7,10 @@ extern crate std;
 extern crate alloc;
 
 // Import appropriate types based on environment
-#[cfg(feature = "std")]
-use std::vec::Vec;
-
 #[cfg(all(not(feature = "std"), feature = "alloc"))]
 use alloc::vec::Vec;
+#[cfg(feature = "std")]
+use std::vec::Vec;
 
 use wrt_decoder::instructions::{encode_instruction, parse_instruction};
 use wrt_test_registry::{assert_eq_test, assert_test, register_test};

wrt-component/examples/component_graph_view.rs

@@ -1,23 +1,23 @@
-use std::env;
-use std::fmt::Write as FmtWrite;
-use std::fs;
-use std::io;
+use std::{env, fmt::Write as FmtWrite, fs, io};
 
+use crossterm::{
+    event::{self, Event, KeyCode, KeyEventKind},
+    terminal::{disable_raw_mode, enable_raw_mode},
+};
+use ratatui::{
+    layout::{Alignment, Constraint, Direction, Layout, Rect},
+    prelude::*,
+    style::{Color, Modifier, Style, Stylize},
+    widgets::{Block, Borders, List, ListItem, Paragraph, StatefulWidget, Widget},
+};
+use strum::{Display, EnumIter, FromRepr, IntoEnumIterator};
+use tui_nodes::{Connection, LineType, NodeGraph, NodeLayout};
 use wrt_component::component::{
     AliasInfo, Component, ComponentSummary, CoreInstanceInfo, CoreModuleInfo, ExtendedExportInfo,
     ExtendedImportInfo, ModuleExportInfo, ModuleImportInfo,
 };
 use wrt_decoder::ProducersSection;
 use wrt_error::{Error, Result};
-
-use crossterm::event::{self, Event, KeyCode, KeyEventKind};
-use crossterm::terminal::{disable_raw_mode, enable_raw_mode};
-use ratatui::layout::{Alignment, Constraint, Direction, Layout, Rect};
-use ratatui::prelude::*;
-use ratatui::style::{Color, Modifier, Style, Stylize};
-use ratatui::widgets::{Block, Borders, List, ListItem, Paragraph, StatefulWidget, Widget};
-use strum::{Display, EnumIter, FromRepr, IntoEnumIterator};
-use tui_nodes::{Connection, LineType, NodeGraph, NodeLayout};
 use wrt_format::module::ImportDesc;
 
 /// Main state struct for the application
@@ -760,7 +760,8 @@ impl App {
         graph
     }
 
-    /// Build the details graph showing detailed information about a specific entity
+    /// Build the details graph showing detailed information about a specific
+    /// entity
     fn build_details_graph(&self, width: u16, height: u16) -> NodeGraph<'static> {
         let mut nodes = Vec::new();
         let mut connections = Vec::new();
@@ -948,7 +949,8 @@ impl App {
 
         // Create detailed debug content
         let component_info = format!(
-            "Component file size: {}\nModules: {}\nInstances: {}\nImports: {}\nExports: {}\nAliases: {}",
+            "Component file size: {}\nModules: {}\nInstances: {}\nImports: {}\nExports: \
+             {}\nAliases: {}",
             self.component_bytes.as_ref().map_or(0, |b| b.len()),
             self.component_summary.core_modules_count,
             self.component_summary.core_instances_count,
@@ -1113,7 +1115,8 @@ impl App {
                     % if self.debug_mode {
                         SelectedView::iter().count()
                     } else {
-                        SelectedView::iter().count() - 1 // Skip Debug view when not in debug mode
+                        SelectedView::iter().count() - 1 // Skip Debug view when
+                                                         // not in debug mode
                     };
                 self.selected_view =
                     SelectedView::from_repr(next_idx).unwrap_or(self.selected_view);
@@ -1123,7 +1126,8 @@ impl App {
                 let max_idx = if self.debug_mode {
                     SelectedView::iter().count()
                 } else {
-                    SelectedView::iter().count() - 1 // Skip Debug view when not in debug mode
+                    SelectedView::iter().count() - 1 // Skip Debug view when not
+                                                     // in debug mode
                 };
                 let prev_idx = if current_idx == 0 { max_idx - 1 } else { current_idx - 1 };
                 self.selected_view =
@@ -1257,20 +1261,28 @@ impl App {
 
         // Render status bar
         let mut status_text = match self.selected_view {
-            SelectedView::Overview =>
-                "1-6: Switch Views | Tab/←→: Navigate Views | f: Focus Mode | q: Quit".to_string(),
-            SelectedView::Modules =>
-                "1-6: Switch Views | Tab/←→: Navigate Views | f: Focus Mode | ↑↓: Select Module | Enter: Details | q: Quit".to_string(),
-            SelectedView::Imports =>
-                "1-6: Switch Views | Tab/←→: Navigate Views | f: Focus Mode | ↑↓: Select Import | Enter: Details | q: Quit".to_string(),
-            SelectedView::Exports =>
-                "1-6: Switch Views | Tab/←→: Navigate Views | f: Focus Mode | ↑↓: Select Export | Enter: Details | q: Quit".to_string(),
-            SelectedView::Producers =>
-                "1-6: Switch Views | Tab/←→: Navigate Views | f: Focus Mode | ↑↓: Select Producer | Enter: View Producer Details (Languages, Tools, SDKs) | q: Quit".to_string(),
-            SelectedView::Details =>
-                "1-6: Switch Views | Tab/←→: Navigate Views | q: Quit".to_string(),
-            SelectedView::Debug =>
-                "1-7: Switch Views | Tab/←→: Navigate Views | q: Quit".to_string(),
+            SelectedView::Overview => {
+                "1-6: Switch Views | Tab/←→: Navigate Views | f: Focus Mode | q: Quit".to_string()
+            }
+            SelectedView::Modules => "1-6: Switch Views | Tab/←→: Navigate Views | f: Focus Mode \
+                                      | ↑↓: Select Module | Enter: Details | q: Quit"
+                .to_string(),
+            SelectedView::Imports => "1-6: Switch Views | Tab/←→: Navigate Views | f: Focus Mode \
+                                      | ↑↓: Select Import | Enter: Details | q: Quit"
+                .to_string(),
+            SelectedView::Exports => "1-6: Switch Views | Tab/←→: Navigate Views | f: Focus Mode \
+                                      | ↑↓: Select Export | Enter: Details | q: Quit"
+                .to_string(),
+            SelectedView::Producers => "1-6: Switch Views | Tab/←→: Navigate Views | f: Focus \
+                                        Mode | ↑↓: Select Producer | Enter: View Producer Details \
+                                        (Languages, Tools, SDKs) | q: Quit"
+                .to_string(),
+            SelectedView::Details => {
+                "1-6: Switch Views | Tab/←→: Navigate Views | q: Quit".to_string()
+            }
+            SelectedView::Debug => {
+                "1-7: Switch Views | Tab/←→: Navigate Views | q: Quit".to_string()
+            }
         };
 
         // Modify status bar text to include debug key when debug mode is enabled
@@ -1386,7 +1398,8 @@ fn main() -> io::Result<()> {
         return Ok(());
     }
 
-    // Find the component path (first argument that's not a flag or the program name)
+    // Find the component path (first argument that's not a flag or the program
+    // name)
     let component_path = match args
         .iter()
         .find(|arg| !arg.starts_with('-') && !arg.ends_with("component_graph_view"))
@@ -1520,7 +1533,11 @@ fn main() -> io::Result<()> {
                                         println!("  No producers section found in module #{}", idx);
                                     }
                                     Err(e) => {
-                                        println!("  Error extracting producers section from module #{}: {}", idx, e);
+                                        println!(
+                                            "  Error extracting producers section from module \
+                                             #{}: {}",
+                                            idx, e
+                                        );
                                     }
                                 }
                             }

wrt-component/examples/component_info_simple.rs

@@ -1,21 +1,20 @@
 //! A detailed WebAssembly analyzer using wrt ecosystem
 //!
-//! This example demonstrates how to use wrt-decoder, wrt-component, and wrt-format
-//! to analyze WebAssembly modules and components in depth.
-
-use std::env;
-use std::fs;
-use std::path::Path;
-use std::str;
-use wrt_decoder::component::{
-    analyze_component, analyze_component_extended, extract_embedded_modules, is_valid_module,
-    ComponentAnalyzer, ComponentSummary, ExtendedExportInfo, ExtendedImportInfo, ModuleExportInfo,
-    ModuleImportInfo,
+//! This example demonstrates how to use wrt-decoder, wrt-component, and
+//! wrt-format to analyze WebAssembly modules and components in depth.
+
+use std::{env, fs, path::Path, str};
+
+use wrt_decoder::{
+    component::{
+        analyze_component, analyze_component_extended, extract_embedded_modules, is_valid_module,
+        ComponentAnalyzer, ComponentSummary, ExtendedExportInfo, ExtendedImportInfo,
+        ModuleExportInfo, ModuleImportInfo,
+    },
+    Module,
 };
-use wrt_decoder::Module;
 use wrt_error::Result;
-use wrt_format::binary;
-use wrt_format::wasmparser::SectionId;
+use wrt_format::{binary, wasmparser::SectionId};
 
 /// Displays a hexadecimal dump of a portion of a binary slice.
 fn hex_dump(data: &[u8], offset: usize, len: usize) {
@@ -246,7 +245,8 @@ fn analyze_module(binary: &[u8]) -> Result<()> {
     Ok(())
 }
 
-/// Parses and displays information from the name section of a WebAssembly module.
+/// Parses and displays information from the name section of a WebAssembly
+/// module.
 fn parse_name_section(module: &Module) -> Result<()> {
     println!("\n=== Name Section Analysis ===");
 

wrt-component/examples/interceptor_example.rs

@@ -1,9 +1,12 @@
 use std::sync::Arc;
+
 use wrt_component::{Component, ComponentType};
 use wrt_error::Result;
 use wrt_host::{function::CloneableFn, CallbackRegistry};
-use wrt_intercept::strategies::{FirewallBuilder, StatisticsStrategy};
-use wrt_intercept::{strategies::LoggingStrategy, LinkInterceptor};
+use wrt_intercept::{
+    strategies::{FirewallBuilder, LoggingStrategy, StatisticsStrategy},
+    LinkInterceptor,
+};
 use wrt_runtime::RuntimeInstance;
 use wrt_types::values::Value;
 

wrt-component/src/builtins/async_ops.rs

@@ -6,13 +6,8 @@
 // - async.poll: Poll an async value for completion
 // - async.wait: Wait for an async value to complete
 
-#[cfg(feature = "component-model-async")]
-use wrt_error::{kinds::AsyncError, Error, Result};
-#[cfg(feature = "component-model-async")]
-use wrt_types::builtin::BuiltinType;
-#[cfg(feature = "component-model-async")]
-use wrt_types::component_value::ComponentValue;
-
+#[cfg(all(feature = "component-model-async", not(feature = "std"), feature = "alloc"))]
+use alloc::{boxed::Box, collections::HashMap, sync::Arc, vec::Vec};
 #[cfg(all(feature = "component-model-async", feature = "std"))]
 use std::{
     boxed::Box,
@@ -24,8 +19,12 @@ use std::{
     vec::Vec,
 };
 
-#[cfg(all(feature = "component-model-async", not(feature = "std"), feature = "alloc"))]
-use alloc::{boxed::Box, collections::HashMap, sync::Arc, vec::Vec};
+#[cfg(feature = "component-model-async")]
+use wrt_error::{kinds::AsyncError, Error, Result};
+#[cfg(feature = "component-model-async")]
+use wrt_types::builtin::BuiltinType;
+#[cfg(feature = "component-model-async")]
+use wrt_types::component_value::ComponentValue;
 
 #[cfg(feature = "component-model-async")]
 use crate::builtins::BuiltinHandler;
@@ -213,7 +212,8 @@ impl Future for AsyncValueFuture {
 
         match store.get_status(id) {
             Ok(AsyncStatus::Ready) => Poll::Ready(store.get_result(id)),
-            Ok(AsyncStatus::Failed) => Poll::Ready(store.get_result(id)), // This will return the error
+            Ok(AsyncStatus::Failed) => Poll::Ready(store.get_result(id)), // This will return
+            // the error
             Ok(AsyncStatus::Pending) => {
                 // Register the waker and return Pending
                 let _ = store.set_waker(id, cx.waker().clone());

wrt-component/src/builtins/error.rs

@@ -4,10 +4,8 @@
 // - error.new: Create a new error context
 // - error.trace: Get the trace from an error context
 
-use wrt_error::{codes, kinds::ValidationError, Error, ErrorCategory, Result, WrtError};
-use wrt_types::builtin::BuiltinType;
-use wrt_types::component_value::ComponentValue;
-
+#[cfg(all(not(feature = "std"), feature = "alloc"))]
+use alloc::{boxed::Box, collections::HashMap, string::String, sync::Arc, vec::Vec};
 #[cfg(feature = "std")]
 use std::{
     boxed::Box,
@@ -17,8 +15,8 @@ use std::{
     vec::Vec,
 };
 
-#[cfg(all(not(feature = "std"), feature = "alloc"))]
-use alloc::{boxed::Box, collections::HashMap, string::String, sync::Arc, vec::Vec};
+use wrt_error::{codes, kinds::ValidationError, Error, ErrorCategory, Result, WrtError};
+use wrt_types::{builtin::BuiltinType, component_value::ComponentValue};
 
 use super::BuiltinHandler;
 

wrt-component/src/builtins/mod.rs

@@ -4,20 +4,18 @@
 // Component Model built-ins, including resource handling, async operations,
 // error contexts, and threading.
 
-use wrt_error::{Error, Result};
-use wrt_intercept::{BeforeBuiltinResult, BuiltinInterceptor, InterceptContext};
-use wrt_types::builtin::BuiltinType;
-use wrt_types::component_value::ComponentValue;
-
+#[cfg(all(not(feature = "std"), feature = "alloc"))]
+use alloc::{boxed::Box, sync::Arc, vec::Vec};
 #[cfg(feature = "std")]
 use std::{
     boxed::Box,
     sync::{Arc, Mutex},
     vec::Vec,
 };
 
-#[cfg(all(not(feature = "std"), feature = "alloc"))]
-use alloc::{boxed::Box, sync::Arc, vec::Vec};
+use wrt_error::{Error, Result};
+use wrt_intercept::{BeforeBuiltinResult, BuiltinInterceptor, InterceptContext};
+use wrt_types::{builtin::BuiltinType, component_value::ComponentValue};
 
 use crate::resources::ResourceManager;
 
@@ -301,9 +299,10 @@ impl Clone for BuiltinRegistry {
 
 #[cfg(test)]
 mod tests {
+    use wrt_types::component_value::ComponentValue;
+
     use super::*;
     use crate::resources::ResourceManager;
-    use wrt_types::component_value::ComponentValue;
 
     // Simple test handler implementation
     struct TestHandler {

wrt-component/src/builtins/resource.rs

@@ -6,22 +6,22 @@
 // - resource.rep: Get the representation of a resource
 // - resource.get: Get a resource handle
 
-use wrt_error::{Error, Result};
-use wrt_types::builtin::BuiltinType;
-use wrt_types::component_value::ComponentValue;
-
+#[cfg(all(not(feature = "std"), feature = "alloc"))]
+use alloc::{boxed::Box, sync::Arc, vec::Vec};
 #[cfg(feature = "std")]
 use std::{
     boxed::Box,
     sync::{Arc, Mutex},
     vec::Vec,
 };
 
-#[cfg(all(not(feature = "std"), feature = "alloc"))]
-use alloc::{boxed::Box, sync::Arc, vec::Vec};
+use wrt_error::{Error, Result};
+use wrt_types::{builtin::BuiltinType, component_value::ComponentValue};
 
-use crate::builtins::BuiltinHandler;
-use crate::resources::{ResourceId, ResourceManager};
+use crate::{
+    builtins::BuiltinHandler,
+    resources::{ResourceId, ResourceManager},
+};
 
 /// Handler for the resource.create built-in function
 pub struct ResourceCreateHandler {