Skip to content

Commit

Permalink
Upgrade derive_more crate from 1.0 to 2.0 version
Browse files Browse the repository at this point in the history
  • Loading branch information
tyranron committed Feb 11, 2025
1 parent cebf7bd commit 12388d4
Show file tree
Hide file tree
Showing 9 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion crates/libwebrtc-sys/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fake-media = []
[dependencies]
anyhow = "1.0"
cxx = "1.0"
derive_more = { version = "1.0", features = ["deref", "deref_mut", "from"] }
derive_more = { version = "2.0", features = ["deref", "deref_mut", "from"] }

[build-dependencies]
anyhow = "1.0"
Expand Down
2 changes: 1 addition & 1 deletion crates/libwebrtc-sys/src/bridge.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::fmt;

use anyhow::anyhow;
use cxx::{CxxString, CxxVector, UniquePtr};
use derive_more::{Deref, DerefMut};
use derive_more::with_trait::{Deref, DerefMut};

use crate::{
AddIceCandidateCallback, AudioSourceOnAudioLevelChangeCallback,
Expand Down
2 changes: 1 addition & 1 deletion crates/libwebrtc-sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ use std::{collections::HashMap, mem};

use anyhow::{anyhow, bail};
use cxx::{let_cxx_string, CxxString, CxxVector, UniquePtr};
use derive_more::From;
use derive_more::with_trait::From;

use self::bridge::webrtc;

Expand Down
2 changes: 1 addition & 1 deletion crates/native/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ crate-type = ["cdylib"]
anyhow = "1.0"
cxx = "1.0"
dashmap = "6.0"
derive_more = { version = "1.0", features = ["as_ref", "display", "from", "into"] }
derive_more = { version = "2.0", features = ["as_ref", "display", "from", "into"] }
flutter_rust_bridge = { version = "=2.7.0", features = ["anyhow", "dart-opaque", "rust-async", "thread-pool"], default-features = false }
lazy_static = "1.5"
libwebrtc-sys = { path = "../libwebrtc-sys" }
Expand Down
2 changes: 1 addition & 1 deletion crates/native/src/pc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ use std::{
use anyhow::anyhow;
use cxx::{CxxString, CxxVector};
use dashmap::DashMap;
use derive_more::{Display, From, Into};
use derive_more::with_trait::{Display, From, Into};
use libwebrtc_sys as sys;
use threadpool::ThreadPool;

Expand Down
2 changes: 1 addition & 1 deletion crates/native/src/renderer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ impl TextureEventNotifier {
/// renderer.
mod frame_handler {
use cxx::UniquePtr;
use derive_more::From;
use derive_more::with_trait::From;
use libwebrtc_sys as sys;

use crate::{
Expand Down
2 changes: 1 addition & 1 deletion crates/native/src/user_media.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::{
};

use anyhow::{anyhow, bail, Context};
use derive_more::{AsRef, Display, From, Into};
use derive_more::with_trait::{AsRef, Display, From, Into};
use libwebrtc_sys as sys;
// TODO: Use `std::sync::OnceLock` instead, once it support `.wait()` API.
use once_cell::sync::OnceCell;
Expand Down
2 changes: 1 addition & 1 deletion crates/native/src/video_sink.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use anyhow::anyhow;
use cxx::UniquePtr;
use derive_more::{AsMut, AsRef};
use derive_more::with_trait::{AsMut, AsRef};
use libwebrtc_sys as sys;

use crate::{
Expand Down

0 comments on commit 12388d4

Please sign in to comment.