.pre-commit-config.yaml

@@ -8,17 +8,17 @@ repos:
     hooks:
       - id: nac3-cargo-fmt
         name: nac3 cargo format
-        entry: nix
+        entry: cargo
         language: system
         types: [file, rust]
         pass_filenames: false
         description: Runs cargo fmt on the codebase.
-        args: [develop, -c, cargo, fmt, --all]
+        args: [fmt]
       - id: nac3-cargo-clippy
         name: nac3 cargo clippy
-        entry: nix
+        entry: cargo
         language: system
         types: [file, rust]
         pass_filenames: false
         description: Runs cargo clippy on the codebase.
-        args: [develop, -c, cargo, clippy, --tests]
+        args: [clippy, --tests]

nac3artiq/src/codegen.rs

@@ -32,8 +32,8 @@ use pyo3::{
 
 use crate::{symbol_resolver::InnerResolver, timeline::TimeFns};
 
-use itertools::Itertools;
 use nac3core::inkwell::values::IntValue;
+use itertools::Itertools;
 use std::{
     collections::{hash_map::DefaultHasher, HashMap},
     hash::{Hash, Hasher},

nac3artiq/src/lib.rs

@@ -23,8 +23,6 @@ use std::process::Command;
 use std::rc::Rc;
 use std::sync::Arc;
 
-use itertools::Itertools;
-use nac3core::codegen::{gen_func_impl, CodeGenLLVMOptions, CodeGenTargetMachineOptions};
 use nac3core::inkwell::{
     context::Context,
     memory_buffer::MemoryBuffer,
@@ -34,12 +32,14 @@ use nac3core::inkwell::{
     targets::*,
     OptimizationLevel,
 };
+use itertools::Itertools;
+use nac3core::codegen::{gen_func_impl, CodeGenLLVMOptions, CodeGenTargetMachineOptions};
+use nac3core::toplevel::builtins::get_exn_constructor;
+use nac3core::typecheck::typedef::{into_var_map, TypeEnum, Unifier, VarMap};
 use nac3core::nac3parser::{
     ast::{ExprKind, Stmt, StmtKind, StrRef},
     parser::parse_program,
 };
-use nac3core::toplevel::builtins::get_exn_constructor;
-use nac3core::typecheck::typedef::{into_var_map, TypeEnum, Unifier, VarMap};
 use pyo3::create_exception;
 use pyo3::prelude::*;
 use pyo3::{exceptions, types::PyBytes, types::PyDict, types::PySet};

nac3artiq/src/symbol_resolver.rs

@@ -1,12 +1,11 @@
 use crate::PrimitivePythonId;
-use itertools::Itertools;
 use nac3core::inkwell::{
     module::Linkage,
     types::{BasicType, BasicTypeEnum},
     values::BasicValueEnum,
     AddressSpace,
 };
-use nac3core::nac3parser::ast::{self, StrRef};
+use itertools::Itertools;
 use nac3core::{
     codegen::{
         classes::{NDArrayType, ProxyType},
@@ -23,6 +22,7 @@ use nac3core::{
         typedef::{into_var_map, iter_type_vars, Type, TypeEnum, TypeVar, Unifier, VarMap},
     },
 };
+use nac3core::nac3parser::ast::{self, StrRef};
 use parking_lot::RwLock;
 use pyo3::{
     types::{PyDict, PyTuple},

nac3artiq/src/timeline.rs

@@ -1,9 +1,9 @@
-use itertools::Either;
-use nac3core::codegen::CodeGenContext;
 use nac3core::inkwell::{
     values::{BasicValueEnum, CallSiteValue},
     AddressSpace, AtomicOrdering,
 };
+use itertools::Either;
+use nac3core::codegen::CodeGenContext;
 
 /// Functions for manipulating the timeline.
 pub trait TimeFns {

nac3standalone/src/basic_symbol_resolver.rs

@@ -1,4 +1,3 @@
-use nac3core::nac3parser::ast::{self, StrRef};
 use nac3core::{
     codegen::CodeGenContext,
     symbol_resolver::{SymbolResolver, SymbolValue, ValueEnum},
@@ -8,6 +7,7 @@ use nac3core::{
         typedef::{Type, Unifier},
     },
 };
+use nac3core::nac3parser::ast::{self, StrRef};
 use parking_lot::{Mutex, RwLock};
 use std::collections::HashSet;
 use std::{collections::HashMap, sync::Arc};

nac3standalone/src/main.rs

@@ -10,12 +10,8 @@
 
 use clap::Parser;
 use nac3core::inkwell::{
-    memory_buffer::MemoryBuffer, module::Linkage, passes::PassBuilderOptions,
+    memory_buffer::MemoryBuffer, passes::PassBuilderOptions, support::is_multithreaded, targets::*,
-    support::is_multithreaded, targets::*, OptimizationLevel,
+    OptimizationLevel, module::Linkage
-};
-use nac3core::nac3parser::{
-    ast::{Constant, Expr, ExprKind, StmtKind, StrRef},
-    parser,
 };
 use nac3core::{
     codegen::{
@@ -34,6 +30,10 @@ use nac3core::{
         typedef::{FunSignature, Type, Unifier, VarMap},
     },
 };
+use nac3core::nac3parser::{
+    ast::{Constant, Expr, ExprKind, StmtKind, StrRef},
+    parser,
+};
 use parking_lot::{Mutex, RwLock};
 use std::collections::HashSet;
 use std::num::NonZeroUsize;
@@ -279,14 +279,18 @@ fn main() {
         reloc_mode: RelocMode::PIC,
         ..host_target_machine
     };
-    let target_machine = target_machine_options
-        .create_target_machine(opt_level)
-        .expect("couldn't create target machine");
 
     let context = nac3core::inkwell::context::Context::create();
 
-    let size_t =
+    let size_t = context
-        context.ptr_sized_int_type(&target_machine.get_target_data(), None).get_bit_width();
+        .ptr_sized_int_type(
+            &target_machine_options
+                .create_target_machine(opt_level)
+                .map(|tm| tm.get_target_data())
+                .unwrap(),
+            None,
+        )
+        .get_bit_width();
 
     let program = match fs::read_to_string(file_name.clone()) {
         Ok(program) => program,
@@ -454,6 +458,11 @@ fn main() {
     }
 
     // Optimize `main`
+    let target_machine = llvm_options
+        .target
+        .create_target_machine(llvm_options.opt_level)
+        .expect("couldn't create target machine");
+
     let pass_options = PassBuilderOptions::create();
     pass_options.set_merge_functions(true);
     let passes = format!("default<O{}>", opt_level as u32);