From 79c55d80a0d426593d542ab1433440e5e86863fa Mon Sep 17 00:00:00 2001 From: Kajetan Puchalski Date: Tue, 20 Aug 2024 22:08:45 +0100 Subject: [PATCH] general: Update repo & CI --- .github/workflows/rust.yml | 16 ++++++++++++++++ Cargo.lock | 38 +++++++++++++++++++------------------- Cargo.toml | 6 +----- src/main.rs | 2 +- 4 files changed, 37 insertions(+), 25 deletions(-) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index acc65c7..2d25a40 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -16,7 +16,15 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Install nightly + uses: actions-rs/toolchain@v1 + with: + toolchain: nightly + override: true + components: rustfmt, clippy + - name: Build + uses: actions-rs/cargo@v1 run: cargo build --verbose test: @@ -24,5 +32,13 @@ jobs: steps: - uses: actions/checkout@v4 + - name: Install nightly + uses: actions-rs/toolchain@v1 + with: + toolchain: nightly + override: true + components: rustfmt, clippy + - name: Run tests + uses: actions-rs/cargo@v1 run: cargo test --verbose diff --git a/Cargo.lock b/Cargo.lock index 6cfde9f..5a9be45 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -78,25 +78,6 @@ version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" -[[package]] -name = "c-compiler" -version = "0.1.0" -dependencies = [ - "cfg-if", - "clap", - "colog", - "display_tree", - "env_logger", - "lliw", - "llvm-sys", - "log", - "regex", - "serial_test", - "strum", - "strum_macros", - "synoptic", -] - [[package]] name = "cc" version = "1.1.7" @@ -458,6 +439,25 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rcc" +version = "0.1.0" +dependencies = [ + "cfg-if", + "clap", + "colog", + "display_tree", + "env_logger", + "lliw", + "llvm-sys", + "log", + "regex", + "serial_test", + "strum", + "strum_macros", + "synoptic", +] + [[package]] name = "redox_syscall" version = "0.5.3" diff --git a/Cargo.toml b/Cargo.toml index d12233f..21d283d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "c-compiler" +name = "rcc" version = "0.1.0" edition = "2021" @@ -7,10 +7,6 @@ edition = "2021" # Enable the LLVM codegen backend llvm = ["llvm-sys"] -[[bin]] -name = "rcc" -path = "src/main.rs" - [dependencies] clap = { version = "4.5.11", features = ["derive"] } colog = "1.3.0" diff --git a/src/main.rs b/src/main.rs index 7b70d02..6c2ae10 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,7 @@ use clap::Parser; use log::LevelFilter; -use c_compiler::*; +use rcc::*; #[derive(Parser)] #[command(version, about, long_about = None)]