Skip to content

Commit a8d7606

Browse files
committed
Auto merge of #2539 - JohnTitor:suggest-mach2-instead, r=JohnTitor
Suggest the `mach2` crate instead cc #2286 r? `@ghost`
2 parents 69b86ab + efc0a9e commit a8d7606

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

src/macros.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -307,13 +307,13 @@ macro_rules! align_const {
307307
)*)
308308
}
309309

310-
// This macro is used to deprecate items that should be accessed via the mach crate
310+
// This macro is used to deprecate items that should be accessed via the mach2 crate
311311
#[allow(unused_macros)]
312312
macro_rules! deprecated_mach {
313313
(pub const $id:ident: $ty:ty = $expr:expr;) => {
314314
#[deprecated(
315315
since = "0.2.55",
316-
note = "Use the `mach` crate instead",
316+
note = "Use the `mach2` crate instead",
317317
)]
318318
#[allow(deprecated)]
319319
pub const $id: $ty = $expr;
@@ -328,7 +328,7 @@ macro_rules! deprecated_mach {
328328
(pub type $id:ident = $ty:ty;) => {
329329
#[deprecated(
330330
since = "0.2.55",
331-
note = "Use the `mach` crate instead",
331+
note = "Use the `mach2` crate instead",
332332
)]
333333
#[allow(deprecated)]
334334
pub type $id = $ty;

src/unix/bsd/apple/mod.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ s! {
254254

255255
#[deprecated(
256256
since = "0.2.55",
257-
note = "Use the `mach` crate instead",
257+
note = "Use the `mach2` crate instead",
258258
)]
259259
pub struct mach_timebase_info {
260260
pub numer: u32,
@@ -522,7 +522,7 @@ s! {
522522

523523
#[deprecated(
524524
since = "0.2.55",
525-
note = "Use the `mach` crate instead",
525+
note = "Use the `mach2` crate instead",
526526
)]
527527
pub struct mach_header {
528528
pub magic: u32,
@@ -536,7 +536,7 @@ s! {
536536

537537
#[deprecated(
538538
since = "0.2.55",
539-
note = "Use the `mach` crate instead",
539+
note = "Use the `mach2` crate instead",
540540
)]
541541
pub struct mach_header_64 {
542542
pub magic: u32,
@@ -4790,9 +4790,9 @@ extern "C" {
47904790
newp: *mut ::c_void,
47914791
newlen: ::size_t,
47924792
) -> ::c_int;
4793-
#[deprecated(since = "0.2.55", note = "Use the mach crate")]
4793+
#[deprecated(since = "0.2.55", note = "Use the `mach2` crate instead")]
47944794
pub fn mach_absolute_time() -> u64;
4795-
#[deprecated(since = "0.2.55", note = "Use the mach crate")]
4795+
#[deprecated(since = "0.2.55", note = "Use the `mach2` crate instead")]
47964796
#[allow(deprecated)]
47974797
pub fn mach_timebase_info(info: *mut ::mach_timebase_info) -> ::c_int;
47984798
pub fn mach_host_self() -> mach_port_t;
@@ -5062,14 +5062,14 @@ extern "C" {
50625062
pub fn brk(addr: *const ::c_void) -> *mut ::c_void;
50635063
pub fn sbrk(increment: ::c_int) -> *mut ::c_void;
50645064
pub fn settimeofday(tv: *const ::timeval, tz: *const ::timezone) -> ::c_int;
5065-
#[deprecated(since = "0.2.55", note = "Use the mach crate")]
5065+
#[deprecated(since = "0.2.55", note = "Use the `mach2` crate instead")]
50665066
pub fn _dyld_image_count() -> u32;
5067-
#[deprecated(since = "0.2.55", note = "Use the mach crate")]
5067+
#[deprecated(since = "0.2.55", note = "Use the `mach2` crate instead")]
50685068
#[allow(deprecated)]
50695069
pub fn _dyld_get_image_header(image_index: u32) -> *const mach_header;
5070-
#[deprecated(since = "0.2.55", note = "Use the mach crate")]
5070+
#[deprecated(since = "0.2.55", note = "Use the `mach2` crate instead")]
50715071
pub fn _dyld_get_image_vmaddr_slide(image_index: u32) -> ::intptr_t;
5072-
#[deprecated(since = "0.2.55", note = "Use the mach crate")]
5072+
#[deprecated(since = "0.2.55", note = "Use the `mach2` crate instead")]
50735073
pub fn _dyld_get_image_name(image_index: u32) -> *const ::c_char;
50745074

50755075
pub fn posix_spawn(

0 commit comments

Comments
 (0)