Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,20 @@ jobs:
restore-keys: |
${{ runner.os }}-cargo-
- name: Set up Rust toolchain version
run: echo "TOOLCHAIN_VERSION=$(cat rust-toolchain | tr -d '\n' | tr -d ' ')" >> $GITHUB_ENV
run: |
if [ ! -f rust-toolchain.toml ]; then
echo "Error: rust-toolchain.toml file not found!" >&2
exit 1
fi
TOOLCHAIN_VERSION=$(grep 'channel' rust-toolchain.toml | cut -d '"' -f2)
echo "TOOLCHAIN_VERSION=${TOOLCHAIN_VERSION}" >> $GITHUB_ENV
- name: Install Rust toolchain
run: |
rustup set profile minimal
rustup install "$TOOLCHAIN_VERSION"
rustup default "$TOOLCHAIN_VERSION"
rustup component add rustfmt clippy llvm-tools-preview rustc-dev
rustup show
rustup show
- name: Test
run: cargo test
timeout-minutes: 20
Expand All @@ -45,4 +51,4 @@ jobs:
- name: Clippy
run: |
cargo clippy --all-targets -- -D warnings
cargo +$TOOLCHAIN_VERSION clippy --all-targets --all-features -- -D warnings
cargo +$TOOLCHAIN_VERSION clippy --all-targets --all-features -- -D warnings
2 changes: 1 addition & 1 deletion core/src/host_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ impl<UserMacroTask> HostData<UserMacroTask> {
let task = tasks.get(&task_id).unwrap();
task.abort();

// Manualy decrease the macro tasks counter as the task was aborted.
// Manually decrease the macro tasks counter as the task was aborted.
self.macro_task_count.fetch_sub(1, Ordering::Relaxed);
}

Expand Down