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
47 changes: 22 additions & 25 deletions .github/workflows/cargo-clippy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,46 +6,43 @@ concurrency:

on:
pull_request:
branches: [main, master]
types: [opened, reopened, ready_for_review]
paths:
- ".github/workflows/cargo-clippy.yml"
- "**.rs"
- "Cargo.toml"
- "Cargo.lock"
types: [auto_merge_enabled, opened, ready_for_review, reopened]
push:
branches: [main, master]
tags: [latest, v*.*.*, "*-nightly"]
release:
types: [created, edited]
repository_dispatch:
types: [clippy]
types: [clippy, cargo-clippy]
workflow_dispatch:

permissions:
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
contents: read
security-events: write
statuses: write

jobs:
clippy:
runs-on: ubuntu-latest
permissions:
actions: read # only required for a private repository by github/codeql-action/upload-sarif to get the Action run status
contents: read
security-events: write
statuses: write
steps:
- name: Checkout
uses: actions/checkout@v6
- uses: actions/checkout@v6
with:
fetch-depth: 0
repository: ${{ github.repository }}
ref: ${{ github.event.client_payload.ref || github.ref }}
token: ${{ secrets.GITHUB_TOKEN }}
- name: Setup Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
cache-key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
components: clippy, rustfmt
toolchain: nightly
- name: Setup the for sarif output
run: cargo install clippy-sarif sarif-fmt
components: clippy,rustfmt
- uses: taiki-e/install-action@v2
with:
tool: clippy-sarif sarif-fmt
- name: Run Clippy
run: cargo clippy
--all-features
--message-format=json | clippy-sarif | tee rust-clippy-results.sarif | sarif-fmt
continue-on-error: true
run: |
cargo clippy \
--features full \
--message-format=json | clippy-sarif | tee rust-clippy-results.sarif | sarif-fmt
- name: Upload analysis
uses: github/codeql-action/upload-sarif@v4
with:
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/cargo-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ jobs:
package:
- rspace-traits
- rspace-core
- rspace-derive
- rspace-macros
- rspace
steps:
- name: Checkout
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ on:
push:
branches: [main, master]
tags: [latest, v*.*.*, "*-nightly"]
paths:
- "**.nix"
- "flake.nix"
- "nix/**"
repository_dispatch:
types: [nix, nix-build]
workflow_dispatch:
Expand All @@ -28,10 +24,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
with:
fetch-depth: 0
repository: ${{ github.repository }}
ref: ${{ github.ref }}
token: ${{ github.token }}
- name: Setup Nix
uses: cachix/install-nix-action@v31
with:
github_access_token: ${{ secrets.GITHUB_TOKEN }}
github_access_token: ${{ github.token}}
- name: Build
run: nix build
- name: Check the flake
Expand Down
49 changes: 33 additions & 16 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ concurrency:
on:
pull_request:
branches: [main, master]
types: [opened, synchronize, reopened]
types: [synchronize]
paths:
- ".github/workflows/rust.yml"
- "Cargo.toml"
Expand All @@ -22,11 +22,15 @@ on:
types: [created]
workflow_dispatch:
inputs:
nightly:
default: false
description: "Run `nightly` tests?"
toolchain:
default: stable
description: "Choose which toolchain to test (stable, nightly, all)"
required: true
type: boolean
type: choice
options:
- stable
- nightly
- all

env:
CARGO_TERM_COLOR: always
Expand All @@ -41,8 +45,12 @@ jobs:
target: [x86_64-unknown-linux-gnu]
toolchain: [stable]
steps:
- name: Checkout
uses: actions/checkout@v6
- uses: actions/checkout@v6
with:
fetch-depth: 0
repository: ${{ github.repository }}
ref: ${{ github.ref }}
token: ${{ github.token }}
- name: Setup Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
Expand All @@ -53,32 +61,34 @@ jobs:
- name: Build the workspace
run: cargo build -r --locked --workspace --features full --target ${{ matrix.target }}
test:
if: (github.event_name == 'workflow_dispatch' && github.event.inputs.toolchain != 'nightly') || true
needs: build
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
features: [full, default]
target: [x86_64-unknown-linux-gnu]
toolchain: [stable]
steps:
- name: Checkout
uses: actions/checkout@v6
- uses: actions/checkout@v6
with:
fetch-depth: 0
repository: ${{ github.repository }}
ref: ${{ github.ref }}
token: ${{ github.token }}
- name: Setup Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
cache-key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
target: ${{ matrix.target }}
toolchain: ${{ matrix.toolchain }}
override: true
- name: Test (default)
if: matrix.features == 'default'
run: cargo test -r --locked --workspace --target ${{ matrix.target}}
- name: Test (${{ matrix.features }})
if: matrix.features != 'default'
run: cargo test -r --locked --workspace --target ${{ matrix.target}} --features ${{ matrix.features }}
test_nightly:
if: github.event.inputs.nightly || false
if: (github.event_name == 'workflow_dispatch' && github.event.inputs.toolchain != 'stable') || true
continue-on-error: true
needs: build
runs-on: ubuntu-latest
Expand All @@ -89,8 +99,15 @@ jobs:
- all
- no_std
- "alloc,nightly"
package:
- rspace-traits
steps:
- uses: actions/checkout@v6
with:
fetch-depth: 0
repository: ${{ github.repository }}
ref: ${{ github.ref }}
token: ${{ github.token }}
- name: Setup Rust
uses: actions-rust-lang/setup-rust-toolchain@v1
with:
Expand All @@ -99,16 +116,16 @@ jobs:
override: true
- name: Test (all-features)
if: matrix.features == 'all'
run: cargo test -r --locked --workspace --all-features
run: cargo test -r --locked --all-features --package ${{ matrix.package }}
- name: Test (no_std)
continue-on-error: true
if: matrix.features == 'no_std'
run: cargo test -r --locked --workspace --no-default-features --features nightly
run: cargo test -r --locked --no-default-features --package ${{ matrix.package }}
env:
RUSTFLAGS: "-C panic=abort -Z panic_abort_tests"
- name: Test (${{ matrix.features }})
continue-on-error: true
if: matrix.features != 'all' && matrix.features != 'no_std'
run: cargo test -r --locked --workspace --no-default-features --features ${{ matrix.features }}
run: cargo test -r --locked --no-default-features --features ${{ matrix.features }} --package ${{ matrix.package }}
env:
RUSTFLAGS: "-C panic=abort -Z panic_abort_tests"
35 changes: 8 additions & 27 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 5 additions & 14 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ default-members = ["rspace"]
members = [
"rspace",
"core",
"derive",
"macros",
"traits",
]
resolver = "3"
Expand All @@ -22,20 +20,14 @@ license = "Apache-2.0"
readme = "README.md"
repository = "https://github.com/FL03/rspace.git"
rust-version = "1.85.0"
version = "0.0.6"
version = "0.0.7"

[workspace.dependencies]
rspace = { default-features = false, path = "rspace", version = "0.0.6" }
rspace-core = { default-features = false, path = "core", version = "0.0.6" }
rspace-traits = { default-features = false, path = "traits", version = "0.0.6" }

rspace-derive = { default-features = false, path = "derive", version = "0.0.6" }
rspace-macros = { default-features = false, path = "macros", version = "0.0.6" }
rspace = { default-features = false, path = "rspace", version = "0.0.7" }
rspace-core = { default-features = false, path = "core", version = "0.0.7" }
rspace-traits = { default-features = false, path = "traits", version = "0.0.7" }
# development & benchmarking
criterion = { version = "0.8" }
# concurrency & parallelism
rayon = { default-features = false, version = "1" }
rayon-core = { default-features = false, version = "1" }
# data structures
hashbrown = { default-features = false, version = "0.16" }
# error handling
Expand All @@ -50,7 +42,6 @@ num-traits = { default-features = false, version = "0.2" }
# random
getrandom = { default-features = false, version = "0.3" }
rand = { default-features = false, version = "0.9" }
rand_core = { default-features = false, version = "0.9" }
rand_distr = { default-features = false, version = "0.5" }
# serialization
serde = { default-features = false, features = ["derive"], version = "1" }
Expand All @@ -72,7 +63,7 @@ opt-level = 2
overflow-checks = true
panic = "abort"
rpath = false
strip = "symbols"
strip = false

[profile.release]
codegen-units = 16
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Checkout the current and supported packages below

| Version | Supported |
|:-----------------|:--------------------|
| 0.0.6 (latest) | :white_check_mark: |
| >0.0.1,<=0.0.5 | :white_check_mark: |
| 0.0.7 (latest) | :white_check_mark: |
| >0.0.1,<=0.0.6 | :white_check_mark: |
| 0.0.0 | :x: |

## Reporting a Vulnerability
Expand Down
2 changes: 1 addition & 1 deletion core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ tag-name = "{{version}}"

[lib]
bench = false
crate-type = ["cdylib", "rlib"]
crate-type = ["lib"]
doctest = true
test = true

Expand Down
4 changes: 0 additions & 4 deletions core/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ compile_error! {
// external crates
#[cfg(feature = "alloc")]
extern crate alloc;
#[doc(inline)]
pub use rspace_traits as traits;
// macros
#[macro_use]
pub(crate) mod macros {
Expand All @@ -35,11 +33,9 @@ pub mod point;
pub use self::{
error::{Error, Result},
point::*,
traits::prelude::*,
};
// prelude
#[doc(hidden)]
pub mod prelude {
pub use crate::point::*;
pub use rspace_traits::prelude::*;
}
Loading