Fix linting (#2115)

Cargo.toml

@@ -24,6 +24,7 @@ members = [
   "lib/test-info",
 ]
 exclude = ["benchmark", "cmd/test", "examples", "packages", "test", "tmp"]
+resolver = "2"
 
 [profile.release]
 lto = true

cmd/pen/src/dependency_resolver.rs

@@ -1,6 +1,6 @@
 use super::main_package_directory_finder;
 use crate::infrastructure;
-use std::sync::Arc;
+use std::rc::Rc;
 
 pub fn resolve(
     source_file: &str,
@@ -12,7 +12,7 @@ pub fn resolve(
     output_directory: &str,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let main_package_directory = main_package_directory_finder::find()?;
-    let file_path_converter = Arc::new(infra::FilePathConverter::new(&main_package_directory));
+    let file_path_converter = Rc::new(infra::FilePathConverter::new(&main_package_directory));
 
     app::module_dependency_resolver::resolve(
         &infrastructure::create(file_path_converter.clone(), &main_package_directory)?,

cmd/pen/src/infrastructure.rs

@@ -4,15 +4,15 @@ use crate::file_path_configuration::{
     LANGUAGE_ROOT_SCHEME, LINK_SCRIPT_BASENAME, NINJA_DYNAMIC_DEPENDENCY_FILE_EXTENSION,
     PACKAGES_DIRECTORY,
 };
-use std::{error::Error, path::Path, sync::Arc};
+use std::{error::Error, path::Path, rc::Rc};
 
 pub fn create(
-    file_path_converter: Arc<infra::FilePathConverter>,
+    file_path_converter: Rc<infra::FilePathConverter>,
     main_package_directory: impl AsRef<Path>,
 ) -> Result<app::infra::Infrastructure, Box<dyn Error>> {
-    let file_system = Arc::new(infra::FileSystem::new(file_path_converter.clone()));
+    let file_system = Rc::new(infra::FileSystem::new(file_path_converter.clone()));
 
-    let build_script_compiler = Arc::new(infra::NinjaBuildScriptCompiler::new(
+    let build_script_compiler = Rc::new(infra::NinjaBuildScriptCompiler::new(
         file_path_converter.clone(),
         BIT_CODE_FILE_EXTENSION,
         DEPENDENCY_FILE_EXTENSION,
@@ -22,37 +22,37 @@ pub fn create(
     ));
 
     Ok(app::infra::Infrastructure {
-        build_script_dependency_compiler: Arc::new(infra::NinjaBuildScriptDependencyCompiler::new(
+        build_script_dependency_compiler: Rc::new(infra::NinjaBuildScriptDependencyCompiler::new(
             file_path_converter.clone(),
         )),
-        external_package_initializer: Arc::new(infra::ExternalPackageInitializer::new(
+        external_package_initializer: Rc::new(infra::ExternalPackageInitializer::new(
             file_system.clone(),
             file_path_converter.clone(),
             LANGUAGE_ROOT_SCHEME,
             LANGUAGE_ROOT_ENVIRONMENT_VARIABLE,
             PACKAGES_DIRECTORY,
         )),
         file_system: file_system.clone(),
-        file_path_displayer: Arc::new(infra::FilePathDisplayer::new(
+        file_path_displayer: Rc::new(infra::FilePathDisplayer::new(
             file_path_converter.clone(),
             main_package_directory,
         )),
         file_path_configuration: FILE_PATH_CONFIGURATION.clone().into(),
-        build_script_runner: Arc::new(infra::NinjaBuildScriptRunner::new(
+        build_script_runner: Rc::new(infra::NinjaBuildScriptRunner::new(
             file_path_converter.clone(),
         )),
         build_script_compiler,
-        package_configuration_reader: Arc::new(infra::JsonPackageConfigurationReader::new(
+        package_configuration_reader: Rc::new(infra::JsonPackageConfigurationReader::new(
             file_system.clone(),
             file_path_converter.clone(),
             BUILD_CONFIGURATION_FILENAME,
         )),
-        package_configuration_writer: Arc::new(infra::JsonPackageConfigurationWriter::new(
+        package_configuration_writer: Rc::new(infra::JsonPackageConfigurationWriter::new(
             file_system,
             BUILD_CONFIGURATION_FILENAME,
         )),
-        command_runner: Arc::new(infra::CommandRunner::new(file_path_converter.clone())),
-        test_linker: Arc::new(infra::TestLinker::new(
+        command_runner: Rc::new(infra::CommandRunner::new(file_path_converter.clone())),
+        test_linker: Rc::new(infra::TestLinker::new(
             file_path_converter,
             LANGUAGE_ROOT_ENVIRONMENT_VARIABLE,
         )),

cmd/pen/src/main_module_compiler.rs

@@ -1,6 +1,6 @@
 use super::{compile_configuration::COMPILE_CONFIGURATION, main_package_directory_finder};
 use crate::{application_configuration::APPLICATION_CONFIGURATION, infrastructure};
-use std::{collections::BTreeMap, error::Error, sync::Arc};
+use std::{collections::BTreeMap, error::Error, rc::Rc};
 
 pub fn compile(
     source_file: &str,
@@ -10,7 +10,7 @@ pub fn compile(
     target_triple: Option<&str>,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let main_package_directory = main_package_directory_finder::find()?;
-    let file_path_converter = Arc::new(infra::FilePathConverter::new(&main_package_directory));
+    let file_path_converter = Rc::new(infra::FilePathConverter::new(&main_package_directory));
 
     app::module_compiler::compile_main(
         &infrastructure::create(file_path_converter.clone(), &main_package_directory)?,

cmd/pen/src/module_compiler.rs

@@ -1,6 +1,6 @@
 use super::{compile_configuration::COMPILE_CONFIGURATION, main_package_directory_finder};
 use crate::infrastructure;
-use std::sync::Arc;
+use std::rc::Rc;
 
 pub fn compile(
     source_file: &str,
@@ -10,7 +10,7 @@ pub fn compile(
     target_triple: Option<&str>,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let main_package_directory = main_package_directory_finder::find()?;
-    let file_path_converter = Arc::new(infra::FilePathConverter::new(&main_package_directory));
+    let file_path_converter = Rc::new(infra::FilePathConverter::new(&main_package_directory));
 
     app::module_compiler::compile(
         &infrastructure::create(file_path_converter.clone(), &main_package_directory)?,

cmd/pen/src/package_builder.rs

@@ -6,11 +6,11 @@ use crate::{
     },
     infrastructure,
 };
-use std::{error::Error, sync::Arc};
+use std::{error::Error, rc::Rc};
 
 pub fn build(target_triple: Option<&str>, verbose: bool) -> Result<(), Box<dyn Error>> {
     let main_package_directory = main_package_directory_finder::find()?;
-    let file_path_converter = Arc::new(infra::FilePathConverter::new(
+    let file_path_converter = Rc::new(infra::FilePathConverter::new(
         main_package_directory.clone(),
     ));
     let infrastructure =

cmd/pen/src/package_creator.rs

@@ -3,10 +3,10 @@ use crate::{
     file_path_configuration::{DEFAULT_SYSTEM_PACKAGE_NAME, DEFAULT_SYSTEM_PACKAGE_URL},
     infrastructure,
 };
-use std::{path::PathBuf, sync::Arc};
+use std::{path::PathBuf, rc::Rc};
 
 pub fn create(package_directory: &str, library: bool) -> Result<(), Box<dyn std::error::Error>> {
-    let file_path_converter = Arc::new(infra::FilePathConverter::new(
+    let file_path_converter = Rc::new(infra::FilePathConverter::new(
         PathBuf::from(package_directory).parent().ok_or_else(|| {
             std::io::Error::new(std::io::ErrorKind::NotFound, "parent directory not found")
         })?,

cmd/pen/src/package_documentation_generator.rs

@@ -6,12 +6,12 @@ use app::package_documentation_generator::DocumentationPackage;
 use std::{
     error::Error,
     io::{stdout, Write},
-    sync::Arc,
+    rc::Rc,
 };
 
 pub fn generate(name: &str, url: &str, description: &str) -> Result<(), Box<dyn Error>> {
     let main_package_directory = main_package_directory_finder::find()?;
-    let file_path_converter = Arc::new(infra::FilePathConverter::new(
+    let file_path_converter = Rc::new(infra::FilePathConverter::new(
         main_package_directory.clone(),
     ));
 

cmd/pen/src/package_formatter.rs

@@ -1,9 +1,9 @@
 use crate::{infrastructure, main_package_directory_finder};
-use std::{error::Error, sync::Arc};
+use std::{error::Error, rc::Rc};
 
 pub fn format(check: bool) -> Result<(), Box<dyn Error>> {
     let main_package_directory = main_package_directory_finder::find()?;
-    let file_path_converter = Arc::new(infra::FilePathConverter::new(
+    let file_path_converter = Rc::new(infra::FilePathConverter::new(
         main_package_directory.clone(),
     ));
     let infrastructure =

cmd/pen/src/package_test_information_compiler.rs

@@ -1,12 +1,12 @@
 use crate::{infrastructure, main_package_directory_finder};
-use std::sync::Arc;
+use std::rc::Rc;
 
 pub fn compile(
     module_test_information_files: &[&str],
     package_test_information_file: &str,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let main_package_directory = main_package_directory_finder::find()?;
-    let file_path_converter = Arc::new(infra::FilePathConverter::new(&main_package_directory));
+    let file_path_converter = Rc::new(infra::FilePathConverter::new(&main_package_directory));
 
     app::package_test_information_compiler::compile(
         &infrastructure::create(file_path_converter.clone(), &main_package_directory)?,

cmd/pen/src/prelude_module_compiler.rs

@@ -1,6 +1,6 @@
 use super::{compile_configuration::COMPILE_CONFIGURATION, main_package_directory_finder};
 use crate::infrastructure;
-use std::sync::Arc;
+use std::rc::Rc;
 
 pub fn compile(
     source_file: &str,
@@ -9,7 +9,7 @@ pub fn compile(
     target_triple: Option<&str>,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let main_package_directory = main_package_directory_finder::find()?;
-    let file_path_converter = Arc::new(infra::FilePathConverter::new(&main_package_directory));
+    let file_path_converter = Rc::new(infra::FilePathConverter::new(&main_package_directory));
 
     app::module_compiler::compile_prelude(
         &infrastructure::create(file_path_converter.clone(), &main_package_directory)?,

cmd/pen/src/test_linker.rs

@@ -2,15 +2,15 @@ use crate::{
     file_path_configuration::{DEFAULT_TARGET_DIRECTORY, OUTPUT_DIRECTORY},
     infrastructure, main_package_directory_finder,
 };
-use std::sync::Arc;
+use std::rc::Rc;
 
 pub fn link(
     archive_files: &[&str],
     package_test_information_file: &str,
     test_file: &str,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let main_package_directory = main_package_directory_finder::find()?;
-    let file_path_converter = Arc::new(infra::FilePathConverter::new(&main_package_directory));
+    let file_path_converter = Rc::new(infra::FilePathConverter::new(&main_package_directory));
 
     app::test_linker::link(
         &infrastructure::create(file_path_converter.clone(), &main_package_directory)?,

cmd/pen/src/test_module_compiler.rs

@@ -1,6 +1,6 @@
 use super::{compile_configuration::COMPILE_CONFIGURATION, main_package_directory_finder};
 use crate::{infrastructure, test_configuration::TEST_CONFIGURATION};
-use std::sync::Arc;
+use std::rc::Rc;
 
 pub fn compile(
     source_file: &str,
@@ -10,7 +10,7 @@ pub fn compile(
     target_triple: Option<&str>,
 ) -> Result<(), Box<dyn std::error::Error>> {
     let main_package_directory = main_package_directory_finder::find()?;
-    let file_path_converter = Arc::new(infra::FilePathConverter::new(
+    let file_path_converter = Rc::new(infra::FilePathConverter::new(
         main_package_directory_finder::find()?,
     ));
 

cmd/pen/src/test_runner.rs

@@ -5,11 +5,11 @@ use crate::{
     },
     infrastructure, main_package_directory_finder,
 };
-use std::sync::Arc;
+use std::rc::Rc;
 
 pub fn run() -> Result<(), Box<dyn std::error::Error>> {
     let main_package_directory = main_package_directory_finder::find()?;
-    let file_path_converter = Arc::new(infra::FilePathConverter::new(&main_package_directory));
+    let file_path_converter = Rc::new(infra::FilePathConverter::new(&main_package_directory));
     let infrastructure =
         infrastructure::create(file_path_converter.clone(), &main_package_directory)?;
     let main_package_directory =

cmd/test/src/heap.rs

@@ -6,22 +6,21 @@ const MAX_STACK_SIZE: usize = 2 << (2 * 10);
 pub extern "C" fn _pen_malloc(size: usize) -> *mut u8 {
     check_stack_size(size);
 
-    (unsafe { alloc(Layout::from_size_align(size, ffi::DEFAULT_MEMORY_ALIGNMENT).unwrap()) })
-        as *mut u8
+    unsafe { alloc(Layout::from_size_align(size, ffi::DEFAULT_MEMORY_ALIGNMENT).unwrap()) }
 }
 
 #[no_mangle]
 pub extern "C" fn _pen_realloc(old_pointer: *mut u8, size: usize) -> *mut u8 {
     check_stack_size(size);
 
     // Layouts are expected to be ignored by the global allocator.
-    (unsafe {
+    unsafe {
         realloc(
-            old_pointer as *mut u8,
+            old_pointer,
             Layout::from_size_align(0, ffi::DEFAULT_MEMORY_ALIGNMENT).unwrap(),
             size,
         )
-    }) as *mut u8
+    }
 }
 
 /// # Safety

lib/app/src/infra/file_path.rs

@@ -43,8 +43,9 @@ impl FilePath {
     pub fn with_extension(&self, extension: &str) -> Self {
         if let Some(last) = self.components.last() {
             Self::new(
-                self.components().take(self.components.len() - 1).chain(
-                    [regex::Regex::new(r"(\..*)?$")
+                self.components()
+                    .take(self.components.len() - 1)
+                    .chain([regex::Regex::new(r"(\..*)?$")
                         .unwrap()
                         .replace(
                             last,
@@ -55,9 +56,7 @@ impl FilePath {
                             }
                             .as_str(),
                         )
-                        .deref()]
-                    .into_iter(),
-                ),
+                        .deref()]),
             )
         } else {
             self.clone()

lib/app/src/infra/infrastructure.rs

@@ -3,23 +3,23 @@ use super::{
     ExternalPackageInitializer, FilePathConfiguration, FilePathDisplayer, FileSystem,
     PackageConfigurationReader, PackageConfigurationWriter, TestLinker,
 };
-use std::sync::Arc;
+use std::rc::Rc;
 
 // Infrastructure is agnostic about the following concepts and their information
 // should be passed through function arguments instead.
 //
 // - Output directory
 // - Main package directory
 pub struct Infrastructure {
-    pub build_script_dependency_compiler: Arc<dyn BuildScriptDependencyCompiler>,
-    pub external_package_initializer: Arc<dyn ExternalPackageInitializer>,
-    pub file_path_configuration: Arc<FilePathConfiguration>,
-    pub file_path_displayer: Arc<dyn FilePathDisplayer>,
-    pub file_system: Arc<dyn FileSystem>,
-    pub build_script_compiler: Arc<dyn BuildScriptCompiler>,
-    pub build_script_runner: Arc<dyn BuildScriptRunner>,
-    pub package_configuration_reader: Arc<dyn PackageConfigurationReader>,
-    pub package_configuration_writer: Arc<dyn PackageConfigurationWriter>,
-    pub command_runner: Arc<dyn CommandRunner>,
-    pub test_linker: Arc<dyn TestLinker>,
+    pub build_script_dependency_compiler: Rc<dyn BuildScriptDependencyCompiler>,
+    pub external_package_initializer: Rc<dyn ExternalPackageInitializer>,
+    pub file_path_configuration: Rc<FilePathConfiguration>,
+    pub file_path_displayer: Rc<dyn FilePathDisplayer>,
+    pub file_system: Rc<dyn FileSystem>,
+    pub build_script_compiler: Rc<dyn BuildScriptCompiler>,
+    pub build_script_runner: Rc<dyn BuildScriptRunner>,
+    pub package_configuration_reader: Rc<dyn PackageConfigurationReader>,
+    pub package_configuration_writer: Rc<dyn PackageConfigurationWriter>,
+    pub command_runner: Rc<dyn CommandRunner>,
+    pub test_linker: Rc<dyn TestLinker>,
 }

lib/hir-mir/src/transformation/map_context.rs

@@ -8,7 +8,7 @@ use hir::{
     types::{self, Type},
 };
 
-pub(self) fn context_function_name(
+fn context_function_name(
     type_: &types::Map,
     types: &FnvHashMap<String, Type>,
 ) -> Result<String, CompileError> {

lib/hir-mir/src/transformation/record_hash_function.rs

@@ -115,8 +115,8 @@ fn compile_function_definition(
         Lambda::new(
             vec![Argument::new(RECORD_NAME, record_type.clone())],
             hash_type.clone(),
-            type_definition.fields().iter().rev().fold(
-                Ok(Expression::from(compile_identity_hash(type_definition))),
+            type_definition.fields().iter().rev().try_fold(
+                Expression::from(compile_identity_hash(type_definition)),
                 |expression, field| -> Result<_, CompileError> {
                     Ok(Call::new(
                         Some(
@@ -129,7 +129,7 @@ fn compile_function_definition(
                         ),
                         Variable::new(&configuration.combine_function_name, position.clone()),
                         vec![
-                            expression?,
+                            expression,
                             hash_calculation::expression::transform(
                                 context,
                                 &RecordDeconstruction::new(