Skip to content

Commit

Permalink
Merge branch 'main' into testing
Browse files Browse the repository at this point in the history
  • Loading branch information
wmedrano committed Sep 14, 2024
2 parents 0e4b5de + 6f7f133 commit df4f05b
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ jobs:
uses: actions/checkout@v2
- name: Install dependencies
run: sudo apt update && sudo apt install jackd2 libjack-jackd2-0 libjack-jackd2-dev
- name: Lint (No Features)
- name: Lint (Default Features)
run: cargo clippy --all-targets -- -D clippy::all
- name: Lint (metadata)
run: cargo clippy --all-targets --no-default-features --features metadata -- -D clippy::all
- name: Lint (No features)
run: cargo clippy --all-targets --no-default-features -- -D clippy::all
- name: Cargo Fmt
run: cargo fmt --check
10 changes: 6 additions & 4 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,15 @@ jobs:
run: jackd -r -ddummy -r44100 -p1024 &
- name: Install Cargo Nextest
uses: taiki-e/install-action@nextest
- name: Build (Default Features)
run: cargo build --verbose
- name: Build (No Features)
run: cargo build --verbose --no-default-features
- name: Build (metadata)
run: cargo build --verbose --no-default-features --features metadata
- name: Build (examples)
run: cargo build --verbose --examples
- name: Run Tests
run: cargo nextest run --all-features
- name: Run Tests (Default Features)
run: cargo nextest run
- name: Run Tests (No Features)
run: cargo nextest run --no-default-features
- name: Run Doc Tests
run: cargo doc && cargo test --doc
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,5 @@ crossbeam-channel = "0.5"
ctor = "0.2"

[features]
default = ["dynamic_loading", "log", "metadata"]
default = ["dynamic_loading", "log"]
dynamic_loading = ["jack-sys/dynamic_loading"]
metadata = []
3 changes: 0 additions & 3 deletions src/properties.rs
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,8 @@ pub(crate) unsafe extern "C" fn property_changed<P>(
}
}

#[cfg(feature = "metadata")]
pub use metadata::*;

#[cfg(feature = "metadata")]
mod metadata {
use super::{j, uuid, PropertyChange, PropertyChangeHandler};
use crate::Error;
Expand Down Expand Up @@ -189,7 +187,6 @@ mod metadata {
}
}

#[cfg(feature = "metadata")]
impl Client {
/// Get a property from a subject.
///
Expand Down

0 comments on commit df4f05b

Please sign in to comment.