Move fully to rust (#60)

* Move add_smoke back to rust

* Add smoke in rust

* Remove zig trains

* Remove some c things

* Remove zig from packages, workflows, devcontainer

* Bump patch version

Author: scaryrawr

.devcontainer/devcontainer.json

@@ -13,15 +13,10 @@
         "github.vscode-github-actions",
         "rust-lang.rust-analyzer",
         "fill-labs.dependi",
-        "vadimcn.vscode-lldb",
-        "ziglang.vscode-zig"
+        "vadimcn.vscode-lldb"
       ]
     }
   },
-  "containerEnv": {
-    "VCPKG_FORCE_SYSTEM_BINARIES": "1",
-    "VCPKG_ROOT": "/home/vscode/.local/share/vcpkg"
-  },
   "onCreateCommand": "${containerWorkspaceFolder}/.devcontainer/onCreateCommand.sh",
   "containerUser": "vscode",
   "remoteUser": "vscode"

.devcontainer/onCreateCommand.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-sudo dnf install -y dnf-plugins-core cargo @c-development @rpm-development-tools rpkg rustfmt rust-src rust-analyzer zig
+sudo dnf install -y dnf-plugins-core cargo @c-development @rpm-development-tools rpkg rustfmt rust-src rust-analyzer

.github/workflows/posix-build.yml

@@ -13,26 +13,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install zig
-        run: |
-          if [ -f /home/linuxbrew/.linuxbrew/bin/brew ]; then
-            eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-          fi
-          brew install zig
-
       - name: Build Debug
-        run: |
-          if [ -f /home/linuxbrew/.linuxbrew/bin/brew ]; then
-            eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-          fi
-          cargo build
+        run: cargo build
 
       - name: Build Release
-        run: |
-          if [ -f /home/linuxbrew/.linuxbrew/bin/brew ]; then
-            eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
-          fi
-          cargo build --release
+        run: cargo build --release
 
       - name: Test
         run: |

.github/workflows/win-build.yml

@@ -14,9 +14,6 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install zig
-        run: choco install -y zig
-
       - name: Install toolchain
         run: rustup target install ${{ matrix.target }}-pc-windows-msvc
 

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.28)
 project("SL"
-        VERSION 6.1.3
+        VERSION 6.1.4
         DESCRIPTION "CHOO CHOO"
         LANGUAGES C)
 
@@ -10,10 +10,10 @@ install(FILES ${CURSES_DLL} ${SL_EXE} DESTINATION bin COMPONENT applications)
 set(CPACK_PACKAGE_NAME "sl")
 set(CPACK_PACKAGE_VENDOR "sl")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "SL (Steam Locomotive)")
-set(CPACK_PACKAGE_VERSION "6.1.3")
+set(CPACK_PACKAGE_VERSION "6.1.4")
 set(CPACK_PACKAGE_VERSION_MAJOR "6")
 set(CPACK_PACKAGE_VERSION_MINOR "1")
-set(CPACK_PACKAGE_VERSION_PATCH "3")
+set(CPACK_PACKAGE_VERSION_PATCH "4")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "sl")
 set(CPACK_COMPONENTS_ALL applications)
 set(CPACK_COMPONENT_APPLICATIONS_DISPLAY_NAME "sl")

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "sl"
-version = "6.1.3"
+version = "6.1.4"
 edition = "2021"
 build = "build.rs"
 
@@ -22,4 +22,3 @@ unicode-segmentation = "1.12.0"
 clap = { version = "4.5.23", features = ["derive"] }
 clap_complete = "4.5.40"
 clap_mangen = "0.2.24"
-zig = { git = "https://github.com/scaryrawr/zig-rs", version = "0.1.0" }

Cargo.toml

@@ -6,13 +6,6 @@ use clap_complete::{generate_to, Shell};
 include!("src/cli.rs");
 
 fn main() -> Result<(), Error> {
-    println!("cargo:rerun-if-changed=libsl/build.zig");
-    println!("cargo:rerun-if-changed=libsl/src");
-
-    let dst = zig::build("libsl");
-
-    println!("cargo:rustc-link-search=native={}", dst.display());
-
     let completion_dir = match env::var_os("COMPLETION_DIR") {
         None => return Ok(()),
         Some(completion_dir) => completion_dir,

build.rs

@@ -1,6 +1,6 @@
 .ie \n(.g .ds Aq \(aq
 .el .ds Aq '
-.TH sl 1  "sl 6.1.3" 
+.TH sl 1  "sl 6.1.4" 
 .SH NAME
 sl \- sl cures your bad habit of mistyping
 .SH SYNOPSIS
@@ -30,6 +30,6 @@ Print help
 \fB\-V\fR, \fB\-\-version\fR
 Print version
 .SH VERSION
-v6.1.3
+v6.1.4
 .SH AUTHORS
 Toyoda Masashi (mtoyoda@acm.org)