Bump version to 0.3.0

crates/kyac/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kyac"
-version = "0.2.0"
+version = "0.3.0"
 edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

crates/kyanite/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "kyanite"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -14,6 +14,7 @@ colored = "2.0.4"
 fern = { version = "0.6.2", features = ["colored"] }
 kyac = { path = "../kyac" }
 log = "0.4.20"
+runtime = { version = "0.2.0", path = "../runtime" }
 subprocess = { path = "../subprocess" }
 which = "4.4.2"
 

crates/kyanite/src/asm.rs

@@ -13,12 +13,7 @@ pub fn compile<I: ArchInstr, F: Frame<I>>(
     write!(file, "{}{}", F::header(), instrs).unwrap();
     subprocess::handle(subprocess::exec(
         "clang",
-        &[
-            asm,
-            "-o",
-            exe,
-            &format!("{}/libkyanite_runtime.a", include_dir()),
-        ],
+        &[asm, "-o", exe, &format!("{}/libruntime.a", include_dir())],
     ))
     .map_err(PipelineError::CompileError)?;
     Ok(exe.into())

crates/kyanite/src/bin/main.rs

@@ -49,7 +49,15 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
             Ok(())
         }
         Commands::Version => {
-            println!("kyanite {} (kyac {})", kyanite::VERSION, kyac::VERSION);
+            println!(
+                "Kyanite:\n{:>12} {:>5}\n{:>12} {:>5}\n{:>12} {:>5}",
+                "CLI:",
+                kyanite::VERSION,
+                "Compiler:",
+                kyac::VERSION,
+                "Runtime:",
+                runtime::VERSION,
+            );
             Ok(())
         }
     }

crates/kyanite/src/llvm.rs

@@ -13,7 +13,7 @@ pub fn compile(ir: &str, filename: &str) -> Result<String, PipelineError> {
         .map_err(PipelineError::CompileError)?;
     subprocess::handle(subprocess::exec(
         "clang",
-        &[obj, "-o", exe, "-L", &include_dir(), "-lkyanite_runtime"],
+        &[obj, "-o", exe, &format!("{}/libruntime.a", include_dir())],
     ))
     .map_err(PipelineError::CompileError)?;
     Ok(exe.into())

crates/runtime/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "runtime"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
@@ -9,8 +9,7 @@ bumpalo = "3.14.0"
 lazy_static = "1.4.0"
 
 [lib]
-name = "kyanite_runtime"
-crate-type = ["staticlib"]
+crate-type = ["staticlib", "rlib"]
 
 [lints.clippy]
 pedantic = "deny"

crates/runtime/src/lib.rs

@@ -1,3 +1,5 @@
 mod alloc;
 mod cmp;
 mod print;
+
+pub const VERSION: &str = env!("CARGO_PKG_VERSION");

flake.nix

@@ -21,7 +21,7 @@
     in {
       packages.default = pkgs.rustPlatform.buildRustPackage {
         pname = "kyanite";
-        version = "0.2.0";
+        version = "0.3.0";
         src = ./.;
         nativeBuildInputs = with pkgs; [
           rust-stable
@@ -43,7 +43,7 @@
         installPhase = ''
           mkdir -p $out/bin
           mkdir -p $out/lib
-          cp target/release/libkyanite_runtime.a $out/lib/libkyanite_runtime.a
+          cp target/release/libruntime.a $out/lib/libruntime.a
           cp target/release/main $out/bin/kyanite
           wrapProgram $out/bin/kyanite \
             --set KYANITE_RUNTIME_LIB $out/lib \