Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove shared-memory from default features #476

Merged
merged 3 commits into from
Apr 17, 2023
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
8 changes: 7 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ jobs:
command: clippy
args: --all-targets --features unstable -- -D warnings

- name: Clippy shared-memory
uses: actions-rs/cargo@v1
with:
command: clippy
args: --all-targets --features shared-memory -- -D warnings

test:
name: Run tests on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
Expand All @@ -81,7 +87,7 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: build
args: --verbose --all-targets
args: --all-targets --features shared-memory --verbose

- name: Install nextest
run: cargo install cargo-nextest --locked
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,11 @@ jobs:
with:
command: clippy
args: --all-targets --features unstable -- -D warnings
- name: Clippy shared-memory
uses: actions-rs/cargo@v1
with:
command: clippy
args: --all-targets --features shared-memory -- -D warnings
- name: Environment setup
id: env
shell: bash
Expand Down
1 change: 1 addition & 0 deletions Cargo.lock

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

4 changes: 3 additions & 1 deletion commons/zenoh-config/src/defaults.rs
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,10 @@ impl Default for LinkRxConf {
}
}

// Make explicit the value and ignore clippy warning
#[allow(clippy::derivable_impls)]
impl Default for SharedMemoryConf {
fn default() -> Self {
Self { enabled: true }
Self { enabled: false }
}
}
2 changes: 1 addition & 1 deletion commons/zenoh-config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ validated_struct::validator! {
},
pub shared_memory: SharedMemoryConf {
/// Whether shared memory is enabled or not.
/// If set to `false`, the shared-memory transport will be disabled. (default `true`).
/// If set to `true`, the shared-memory transport will be enabled. (default `false`).
enabled: bool,
},
pub auth: #[derive(Default)]
Expand Down
1 change: 0 additions & 1 deletion zenoh/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ default = [
"transport_udp",
"transport_unixsock-stream",
"transport_ws",
"shared-memory",
]

[dependencies]
Expand Down