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.

Sign up for GitHub

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

Update outdated dependencies #607

Merged
merged 2 commits into from
Dec 11, 2023
Merged

Update outdated dependencies #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3336af8
Update outdated dependencies
Mallets Nov 30, 2023
78bff41
Upgrade Rustls dependencies (#615)
DariusIMP Dec 7, 2023
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
132 changes: 103 additions & 29 deletions Cargo.lock
View file
Open in desktop

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

14 changes: 7 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,9 +84,9 @@ const_format = "0.2.30"
crc = "3.0.1"
criterion = "0.5"
derive_more = "0.99.17"
derive-new = "0.5.9"
derive-new = "0.6.0"
env_logger = "0.10.0"
event-listener = "2.5.3"
event-listener = "4.0.0"
flume = "0.11"
form_urlencoded = "1.1.0"
futures = "0.3.25"
Expand All @@ -108,7 +108,7 @@ log = "0.4.17"
lz4_flex = "0.11"
nix = { version = "0.27", features = ["fs"] }
num_cpus = "1.15.0"
ordered-float = "3.4.0"
ordered-float = "4.1.1"
panic-message = "0.3.0"
paste = "1.0.12"
petgraph = "0.6.3"
Expand All @@ -125,8 +125,9 @@ ringbuffer-spsc = "0.1.9"
rsa = "0.9"
rustc_version = "0.4.0"
rustls = { version = "0.21.5", features = ["dangerous_configuration"] }
rustls-native-certs = "0.6.2"
rustls-pemfile = "1.0.2"
rustls-native-certs = "0.7.0"
rustls-pemfile = "2.0.0"
rustls-webpki = "0.102.0"
schemars = "0.8.12"
secrecy = {version = "0.8.0", features = ["serde", "alloc"]}
serde = { version = "1.0.154", default-features = false, features = [
Expand Down Expand Up @@ -154,8 +155,7 @@ uuid = { version = "1.3.0", default-features = false, features = [
] } # Default features are disabled due to usage in no_std crates
validated_struct = "2.1.0"
vec_map = "0.8.2"
rustls-webpki = "0.101.4"
webpki-roots = "0.25"
webpki-roots = "0.26.0"
winapi = { version = "0.3.9", features = ["iphlpapi"] }
z-serial = "0.2.1"
zenoh-ext = { version = "0.11.0-dev", path = "zenoh-ext" }
Expand Down
4 changes: 2 additions & 2 deletions commons/zenoh-sync/src/condition.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
//
use async_std::sync::MutexGuard as AysncMutexGuard;
use event_listener::{Event, EventListener};
use std::sync::MutexGuard;
use std::{pin::Pin, sync::MutexGuard};

pub type ConditionWaiter = EventListener;
pub type ConditionWaiter = Pin<Box<EventListener>>;
/// This is a Condition Variable similar to that provided by POSIX.
/// As for POSIX condition variables, this assumes that a mutex is
/// properly used to coordinate behaviour. In other terms there should
Expand Down
Loading
Loading