Skip to content

Commit

Permalink
Merge branch 'protocol_changes' into remove_publisher_write
Browse files Browse the repository at this point in the history
  • Loading branch information
milyin authored Mar 13, 2024
2 parents 771ad0d + e06b46d commit 5a07fd4
Show file tree
Hide file tree
Showing 139 changed files with 4,859 additions and 4,175 deletions.
140 changes: 112 additions & 28 deletions Cargo.lock

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

7 changes: 5 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,12 @@ libloading = "0.8"
log = "0.4.17"
lz4_flex = "0.11"
nix = { version = "0.27", features = ["fs"] }
num_cpus = "1.15.0"
num_cpus = "1.16.0"
ordered-float = "4.1.1"
panic-message = "0.3.0"
paste = "1.0.12"
petgraph = "0.6.3"
phf = { version = "0.11.2", features = ["macros"] }
pnet = "0.34"
pnet_datalink = "0.34"
proc-macro2 = "1.0.51"
Expand All @@ -136,7 +137,9 @@ secrecy = { version = "0.8.0", features = ["serde", "alloc"] }
serde = { version = "1.0.154", default-features = false, features = [
"derive",
] } # Default features are disabled due to usage in no_std crates
serde_json = "1.0.94"
serde_cbor = "0.11.2"
serde_json = "1.0.114"
serde-pickle = "1.1.1"
serde_yaml = "0.9.19"
sha3 = "0.10.6"
shared_memory = "0.12.4"
Expand Down
3 changes: 2 additions & 1 deletion commons/zenoh-buffers/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,8 @@ pub mod buffer {
let mut slices = self.slices();
match slices.len() {
0 => Cow::Borrowed(b""),
1 => Cow::Borrowed(slices.next().unwrap()),
// SAFETY: it's safe to use unwrap_unchecked() beacuse we are explicitly checking the length is 1.
1 => Cow::Borrowed(unsafe { slices.next().unwrap_unchecked() }),
_ => Cow::Owned(slices.fold(Vec::new(), |mut acc, it| {
acc.extend(it);
acc
Expand Down
Loading

0 comments on commit 5a07fd4

Please sign in to comment.