Skip to content

Commit 0e297de

Browse files
authored
blurmac: Update objc2 to 0.4.1 (servo#40113)
Bumps from 0.2.0 to 0.4.0, we have to temporarily duplicate `objc2-encode`, but the next PR will finish the upgrade and unduplicate that dependency. Testing: No functionality changed, only a refactor Signed-off-by: Ashwin Naren <[email protected]>
1 parent d0c8022 commit 0e297de

File tree

10 files changed

+220
-209
lines changed

10 files changed

+220
-209
lines changed

Cargo.lock

Lines changed: 13 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

deny.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,9 @@ skip = [
193193
# really just a build dep, so not a large problem.
194194
"toml_datetime",
195195
"toml_edit",
196+
197+
# blurmac
198+
"objc2-encode",
196199
]
197200

198201
# github.com organizations to allow git sources for

third_party/blurmac/Cargo.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,4 @@ crate-type = ["rlib"]
1616

1717
[dependencies]
1818
log = "0.4"
19-
objc2 = "0.2"
20-
21-
# Remove this when updating objc2 to a more recent version
22-
[lints.rust]
23-
unexpected_cfgs = { level = "allow" }
19+
objc2 = "0.4"

third_party/blurmac/src/adapter.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,17 @@
88
use std::error::Error;
99
use std::os::raw::c_int;
1010

11-
use objc2::runtime::{Object, YES};
11+
use objc2::ffi::YES;
12+
use objc2::runtime::AnyObject;
1213

1314
use crate::delegate::bm;
1415
use crate::framework::{cb, io, ns};
1516
use crate::utils::{NOT_SUPPORTED_ERROR, nsx};
1617

1718
#[derive(Clone, Debug)]
1819
pub struct BluetoothAdapter {
19-
pub(crate) manager: *mut Object,
20-
pub(crate) delegate: *mut Object,
20+
pub(crate) manager: *mut AnyObject,
21+
pub(crate) delegate: *mut AnyObject,
2122
}
2223
// TODO: implement std::fmt::Debug and/or std::fmt::Display instead of derive?
2324

0 commit comments

Comments
 (0)