Skip to content

Commit

Permalink
Merge pull request #201 from dora-rs/remove-icoryx
Browse files Browse the repository at this point in the history
Remove iceoryx dependency
  • Loading branch information
phil-opp authored Mar 9, 2023
2 parents afcaa86 + 99384e3 commit 8be922a
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 251 deletions.
71 changes: 0 additions & 71 deletions Cargo.lock

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

7 changes: 1 addition & 6 deletions libraries/communication-layer/pub-sub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,14 @@ version.workspace = true
edition = "2021"

[features]
default = ["zenoh", "iceoryx"]
default = ["zenoh"]
zenoh = ["dep:zenoh", "dep:zenoh-config"]
iceoryx = ["dep:iceoryx-rs", "dep:iceoryx-sys"]

[dependencies]
eyre = "0.6.8"
zenoh = { git = "https://github.com/eclipse-zenoh/zenoh.git", rev = "79a136e4fd90b11ff5d775ced981af53c4f1071b", optional = true }
zenoh-config = { git = "https://github.com/eclipse-zenoh/zenoh.git", rev = "79a136e4fd90b11ff5d775ced981af53c4f1071b", optional = true }

[target.'cfg(unix)'.dependencies]
iceoryx-rs = { git = "https://github.com/eclipse-iceoryx/iceoryx-rs.git", optional = true }
iceoryx-sys = { git = "https://github.com/eclipse-iceoryx/iceoryx-rs.git", optional = true }

[package.metadata.docs.rs]
all-features = true
rustdoc-args = ["--cfg", "docsrs"]
158 changes: 0 additions & 158 deletions libraries/communication-layer/pub-sub/src/iceoryx.rs

This file was deleted.

5 changes: 0 additions & 5 deletions libraries/communication-layer/pub-sub/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,9 @@
//! - **[Zenoh](https://zenoh.io/):** The zenoh project implements a distributed
//! publisher/subscriber system with automated routing. To use zenoh, use the
//! [`ZenohCommunicationLayer`][zenoh::ZenohCommunicationLayer] struct.
//! - **[Iceoryx](https://iceoryx.io/):** The Eclipse iceoryx™ project provides an IPC middleware
//! based on shared memory. It is very fast, but it only supports local communication. To use
//! iceoryx, use the [`IceoryxCommunicationLayer`][iceoryx::IceoryxCommunicationLayer] struct.
use std::borrow::Cow;

#[cfg(all(unix, feature = "iceoryx"))]
pub mod iceoryx;
#[cfg(feature = "zenoh")]
pub mod zenoh;

Expand Down
11 changes: 0 additions & 11 deletions libraries/core/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -257,11 +257,6 @@ pub enum CommunicationConfig {
config: Box<zenoh_config::Config>,
prefix: String,
},
Iceoryx {
app_name_prefix: String,
#[serde(default)]
topic_prefix: String,
},
}

impl CommunicationConfig {
Expand All @@ -273,12 +268,6 @@ impl CommunicationConfig {
} => {
write!(zenoh_prefix, "/{}", prefix).unwrap();
}
CommunicationConfig::Iceoryx { topic_prefix, .. } => {
if !topic_prefix.is_empty() {
topic_prefix.push('-');
}
topic_prefix.push_str(prefix);
}
}
}
}

0 comments on commit 8be922a

Please sign in to comment.