Fix

Cargo.toml

@@ -27,7 +27,7 @@ exclude = ["benchmark", "cmd/test", "examples", "packages", "test", "tmp"]
 resolver = "2"
 
 [workspace.package]
-edition = "2021"
+edition = "2024"
 
 [profile.release]
 lto = true

cmd/pen/src/module_formatter.rs

@@ -1,6 +1,6 @@
 use std::{
     error::Error,
-    io::{stdin, stdout, Read, Write},
+    io::{Read, Write, stdin, stdout},
 };
 
 const STDIN_PATH: &str = "<stdin>";

cmd/pen/src/package_documentation_generator.rs

@@ -5,7 +5,7 @@ use crate::{
 use app::package_documentation_generator::DocumentationPackage;
 use std::{
     error::Error,
-    io::{stdout, Write},
+    io::{Write, stdout},
     rc::Rc,
 };
 

lib/app/src/common/file_path_resolver.rs

@@ -1,11 +1,11 @@
 use super::package_id_calculator;
 use crate::{
+    ApplicationConfiguration,
     common::module_id_calculator,
     infra::{
-        FilePath, FilePathConfiguration, ARCHIVE_DIRECTORY, BUILD_SCRIPT_DIRECTORY,
-        EXTERNAL_PACKAGE_DIRECTORY, OBJECT_DIRECTORY, TEST_DIRECTORY,
+        ARCHIVE_DIRECTORY, BUILD_SCRIPT_DIRECTORY, EXTERNAL_PACKAGE_DIRECTORY, FilePath,
+        FilePathConfiguration, OBJECT_DIRECTORY, TEST_DIRECTORY,
     },
-    ApplicationConfiguration,
 };
 
 const MAIN_ARCHIVE_BASENAME: &str = "main";

lib/app/src/external_package_topological_sorter.rs

@@ -1,5 +1,5 @@
-use crate::{error::ApplicationError, PackageConfiguration};
-use petgraph::{algo::toposort, Graph};
+use crate::{PackageConfiguration, error::ApplicationError};
+use petgraph::{Graph, algo::toposort};
 use std::{collections::BTreeMap, error::Error};
 
 pub fn sort(

lib/app/src/package_build_script_compiler.rs

@@ -2,11 +2,12 @@ mod module_target_collector;
 mod test_module_target_collector;
 
 use crate::{
+    ApplicationConfiguration, PackageType,
     common::file_path_resolver,
     external_package_configuration_reader, external_package_topological_sorter,
     infra::{FilePath, Infrastructure, MainModuleTarget},
     module_target_source_resolver, package_name_formatter, prelude_interface_file_finder,
-    system_package_finder, ApplicationConfiguration, PackageType,
+    system_package_finder,
 };
 use std::error::Error;
 

lib/app/src/package_builder.rs

@@ -1,9 +1,10 @@
 use super::application_configuration::ApplicationConfiguration;
 use crate::{
+    PackageType,
     common::file_path_resolver,
     error::ApplicationError,
     infra::{FilePath, Infrastructure},
-    package_build_script_compiler, PackageType,
+    package_build_script_compiler,
 };
 use std::error::Error;
 

lib/app/src/package_creator.rs

@@ -1,8 +1,8 @@
 use crate::{
+    ApplicationConfiguration,
     common::file_path_resolver,
     infra::{FilePath, Infrastructure},
     package_configuration::{PackageConfiguration, PackageType},
-    ApplicationConfiguration,
 };
 use std::{collections::BTreeMap, error::Error};
 

lib/app/src/package_test_builder.rs

@@ -1,8 +1,9 @@
 use crate::{
+    ApplicationConfiguration,
     common::file_path_resolver,
     error::ApplicationError,
     infra::{FilePath, Infrastructure},
-    package_build_script_compiler, ApplicationConfiguration,
+    package_build_script_compiler,
 };
 use std::error::Error;
 

lib/app/src/test_runner.rs

@@ -1,8 +1,9 @@
 use crate::{
+    ApplicationConfiguration,
     common::file_path_resolver,
     error::ApplicationError,
     infra::{FilePath, Infrastructure},
-    package_test_builder, ApplicationConfiguration,
+    package_test_builder,
 };
 use std::error::Error;
 

lib/ast-hir/src/import.rs

@@ -188,7 +188,7 @@ mod tests {
         test::{FunctionDefinitionFake, ModuleFake, TypeAliasFake, TypeDefinitionFake},
         types,
     };
-    use position::{test::PositionFake, Position};
+    use position::{Position, test::PositionFake};
     use pretty_assertions::assert_eq;
 
     fn compile_module(

lib/ast-hir/src/imported_module/validation.rs

@@ -34,7 +34,7 @@ pub fn validate(module: &ImportedModule) -> Result<(), CompileError> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use position::{test::PositionFake, Position};
+    use position::{Position, test::PositionFake};
 
     #[test]
     fn validate_undefined_name() {

lib/ast-hir/src/lib.rs

@@ -71,7 +71,7 @@ fn transform_module(module: &ir::Module, prefix: &str) -> Result<ir::Module, Com
 mod tests {
     use super::*;
     use hir::test::ModuleFake;
-    use position::{test::PositionFake, Position};
+    use position::{Position, test::PositionFake};
 
     #[test]
     fn compile_empty_module() {

lib/ast-hir/src/module.rs

@@ -402,7 +402,7 @@ fn compile_if(
 mod tests {
     use super::*;
     use hir::test::ModuleFake;
-    use position::{test::PositionFake, Position};
+    use position::{Position, test::PositionFake};
     use pretty_assertions::assert_eq;
 
     #[test]

lib/ast-hir/src/module_prefix.rs

@@ -11,7 +11,7 @@ pub fn compile(import: &ast::Import) -> String {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use position::{test::PositionFake, Position};
+    use position::{Position, test::PositionFake};
 
     #[test]
     fn calculate_prefix_for_internal_module_import() {

lib/ast-hir/src/number.rs

@@ -27,7 +27,7 @@ pub fn compile(number: &Number) -> Result<f64, CompileError> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use position::{test::PositionFake, Position};
+    use position::{Position, test::PositionFake};
 
     #[test]
     fn compile_binary() {

lib/ast/src/ast/if_branch.rs

@@ -1,4 +1,4 @@
-use super::{expression::Expression, Block};
+use super::{Block, expression::Expression};
 use std::rc::Rc;
 
 #[derive(Clone, Debug, PartialEq)]

lib/ast/src/ast/if_list.rs

@@ -1,4 +1,4 @@
-use super::{expression::Expression, Block};
+use super::{Block, expression::Expression};
 use position::Position;
 use std::rc::Rc;
 

lib/ast/src/ast/if_map.rs

@@ -1,4 +1,4 @@
-use super::{expression::Expression, Block};
+use super::{Block, expression::Expression};
 use position::Position;
 use std::rc::Rc;
 

lib/ast/src/ast/if_type.rs

@@ -1,4 +1,4 @@
-use super::{expression::Expression, if_type_branch::IfTypeBranch, Block};
+use super::{Block, expression::Expression, if_type_branch::IfTypeBranch};
 use position::Position;
 use std::rc::Rc;
 

lib/ast/src/ast/list_comprehension.rs

@@ -1,5 +1,5 @@
 use super::expression::Expression;
-use crate::{types::Type, ListComprehensionBranch};
+use crate::{ListComprehensionBranch, types::Type};
 use position::Position;
 use std::rc::Rc;
 

lib/ast/src/ast/module.rs

@@ -1,5 +1,5 @@
 use super::{
-    function_definition::FunctionDefinition, type_definition::TypeDefinition, ForeignImport, Import,
+    ForeignImport, Import, function_definition::FunctionDefinition, type_definition::TypeDefinition,
 };
 use position::Position;
 

lib/ast/src/ast/record.rs

@@ -1,4 +1,4 @@
-use super::{expression::Expression, RecordField};
+use super::{RecordField, expression::Expression};
 use position::Position;
 use std::rc::Rc;
 

lib/doc/src/lib.rs

@@ -291,7 +291,7 @@ fn compile_last_block_comment(context: &Context, position: &Position) -> Option<
 mod tests {
     use super::*;
     use indoc::indoc;
-    use position::{test::PositionFake, Position};
+    use position::{Position, test::PositionFake};
 
     const TEST_LANGUAGE: &str = "pen";
 

lib/ffi-macro/src/attribute_list.rs

@@ -1,7 +1,7 @@
 use syn::{
+    Meta, Result, Token,
     parse::{Parse, ParseStream},
     punctuated::Punctuated,
-    Meta, Result, Token,
 };
 
 pub struct AttributeList {

lib/ffi-macro/src/bindgen.rs

@@ -3,7 +3,7 @@ use proc_macro::TokenStream;
 use quote::quote;
 use std::error::Error;
 use syn::{
-    parse_quote, FnArg, Ident, ItemFn, Pat, Path, PathArguments, PathSegment, ReturnType, Type,
+    FnArg, Ident, ItemFn, Pat, Path, PathArguments, PathSegment, ReturnType, Type, parse_quote,
 };
 
 pub fn generate(

lib/ffi-macro/src/lib.rs

@@ -8,7 +8,7 @@ use self::attribute_list::AttributeList;
 use proc_macro::TokenStream;
 use quote::quote;
 use std::error::Error;
-use syn::{parse_macro_input, ItemFn, ItemStruct};
+use syn::{ItemFn, ItemStruct, parse_macro_input};
 
 #[proc_macro_attribute]
 pub fn bindgen(attributes: TokenStream, item: TokenStream) -> TokenStream {

lib/ffi-macro/src/utilities.rs

@@ -1,7 +1,7 @@
 use crate::attribute_list::AttributeList;
 use quote::quote;
 use std::error::Error;
-use syn::{parse::Parse, parse_str, Expr, ExprLit, Ident, Lit, Meta, Path};
+use syn::{Expr, ExprLit, Ident, Lit, Meta, Path, parse::Parse, parse_str};
 
 const DEFAULT_CRATE_NAME: &str = "ffi";
 

lib/ffi/src/any.rs

@@ -1,4 +1,4 @@
-use crate::{import, Boolean, ByteString, Error, List, Number, TypeInformation};
+use crate::{Boolean, ByteString, Error, List, Number, TypeInformation, import};
 
 import!(pen_ffi_any_is_boolean, fn(any: Any) -> Boolean);
 import!(pen_ffi_any_is_error, fn(any: Any) -> Boolean);

lib/ffi/src/arc/arc_block.rs

@@ -2,7 +2,7 @@ use alloc::alloc::{alloc, dealloc};
 use core::{
     alloc::Layout,
     ptr::{drop_in_place, null},
-    sync::atomic::{fence, AtomicIsize, Ordering},
+    sync::atomic::{AtomicIsize, Ordering, fence},
 };
 
 const UNIQUE_COUNT: isize = 0;

lib/ffi/src/closure.rs

@@ -1,6 +1,6 @@
 use crate::Arc;
 use core::{
-    mem::{transmute, ManuallyDrop},
+    mem::{ManuallyDrop, transmute},
     ops::Deref,
     sync::atomic::{AtomicPtr, Ordering},
 };

lib/ffi/src/cps/async_stack.rs

@@ -1,4 +1,4 @@
-use super::{async_stack_action::AsyncStackAction, CpsError, Stack};
+use super::{CpsError, Stack, async_stack_action::AsyncStackAction};
 use alloc::{vec, vec::Vec};
 use core::{
     future::Future,
@@ -178,7 +178,7 @@ unsafe impl<V: Sync> Sync for AsyncStack<V> {}
 mod tests {
     use super::*;
     use core::{
-        future::{ready, Ready},
+        future::{Ready, ready},
         ptr::null,
         task::{RawWaker, RawWakerVTable, Waker},
     };

lib/ffi/src/future/call.rs

@@ -62,8 +62,8 @@ macro_rules! call {
 #[cfg(test)]
 mod tests {
     use crate::{
-        cps::{AsyncStack, ContinuationFunction},
         ByteString, Closure, Number,
+        cps::{AsyncStack, ContinuationFunction},
     };
     use core::future::ready;
 

lib/ffi/src/future/call_function.rs

@@ -51,8 +51,8 @@ macro_rules! call_function {
 #[cfg(test)]
 mod tests {
     use crate::{
-        cps::{AsyncStack, ContinuationFunction},
         ByteString, Number,
+        cps::{AsyncStack, ContinuationFunction},
     };
     use core::future::ready;
 

lib/ffi/src/future/from_closure.rs

@@ -1,6 +1,6 @@
 use crate::{
-    cps::{AsyncStack, ContinuationFunction, StepFunction},
     Closure,
+    cps::{AsyncStack, ContinuationFunction, StepFunction},
 };
 use core::{future::poll_fn, intrinsics::transmute, task::Poll};
 

lib/ffi/src/future/stream.rs

@@ -1,4 +1,4 @@
-use crate::{future, import, Any, Arc, Boolean, Closure, List};
+use crate::{Any, Arc, Boolean, Closure, List, future, import};
 use futures::Stream;
 
 import!(pen_ffi_list_first_rest, async fn(list: List) -> Arc<FirstRest>);

lib/ffi/src/future/to_closure.rs

@@ -1,6 +1,6 @@
 use crate::{
-    cps::{AsyncStack, ContinuationFunction},
     Closure,
+    cps::{AsyncStack, ContinuationFunction},
 };
 use alloc::boxed::Box;
 use core::{future::Future, pin::Pin, task::Poll};

lib/ffi/src/list.rs

@@ -1,4 +1,4 @@
-use crate::{import, Any, Arc, Closure};
+use crate::{Any, Arc, Closure, import};
 
 import!(pen_ffi_list_create, fn() -> List);
 import!(pen_ffi_list_lazy, fn(xs: Closure) -> List);