Skip to content

Commit e425743

Browse files
committed
Remove mach-related items
1 parent bea1bcb commit e425743

File tree

4 files changed

+0
-327
lines changed

4 files changed

+0
-327
lines changed

libc-test/build.rs

-12
Original file line numberDiff line numberDiff line change
@@ -202,14 +202,6 @@ fn test_apple(target: &str) {
202202
"libproc.h",
203203
"limits.h",
204204
"locale.h",
205-
"mach-o/dyld.h",
206-
"mach/mach_init.h",
207-
"mach/mach.h",
208-
"mach/mach_time.h",
209-
"mach/mach_types.h",
210-
"mach/mach_vm.h",
211-
"mach/thread_act.h",
212-
"mach/thread_policy.h",
213205
"malloc/malloc.h",
214206
"net/bpf.h",
215207
"net/dlil.h",
@@ -319,10 +311,6 @@ fn test_apple(target: &str) {
319311
});
320312

321313
cfg.skip_const(move |name| {
322-
// They're declared via `deprecated_mach` and we don't support it anymore.
323-
if name.starts_with("VM_FLAGS_") {
324-
return true;
325-
}
326314
match name {
327315
// These OSX constants are removed in Sierra.
328316
// https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOS10_12/Swift/Darwin.html

libc-test/semver/apple.txt

-107
Original file line numberDiff line numberDiff line change
@@ -1353,9 +1353,6 @@ STA_RONLY
13531353
STA_UNSYNC
13541354
ST_NOSUID
13551355
ST_RDONLY
1356-
SUPERPAGE_NONE
1357-
SUPERPAGE_SIZE_2MB
1358-
SUPERPAGE_SIZE_ANY
13591356
SYSPROTO_CONTROL
13601357
SYSPROTO_EVENT
13611358
S_IEXEC
@@ -1516,95 +1513,10 @@ UTUN_OPT_IFNAME
15161513
VDISCARD
15171514
VDSUSP
15181515
VLNEXT
1519-
VM_FLAGS_ALIAS_MASK
1520-
VM_FLAGS_ANYWHERE
1521-
VM_FLAGS_FIXED
1522-
VM_FLAGS_NO_CACHE
1523-
VM_FLAGS_OVERWRITE
1524-
VM_FLAGS_PURGABLE
1525-
VM_FLAGS_RANDOM_ADDR
1526-
VM_FLAGS_RESILIENT_CODESIGN
1527-
VM_FLAGS_RESILIENT_MEDIA
1528-
VM_FLAGS_RETURN_4K_DATA_ADDR
1529-
VM_FLAGS_RETURN_DATA_ADDR
1530-
VM_FLAGS_SUPERPAGE_MASK
1531-
VM_FLAGS_SUPERPAGE_NONE
1532-
VM_FLAGS_SUPERPAGE_SHIFT
1533-
VM_FLAGS_SUPERPAGE_SIZE_2MB
1534-
VM_FLAGS_SUPERPAGE_SIZE_ANY
1535-
VM_FLAGS_USER_ALLOCATE
1536-
VM_FLAGS_USER_MAP
1537-
VM_FLAGS_USER_REMAP
15381516
VM_LOADAVG
15391517
VM_MACHFACTOR
15401518
VM_MAKE_TAG
15411519
VM_MAXID
1542-
VM_MEMORY_ACCELERATE
1543-
VM_MEMORY_ANALYSIS_TOOL
1544-
VM_MEMORY_APPKIT
1545-
VM_MEMORY_APPLICATION_SPECIFIC_1
1546-
VM_MEMORY_APPLICATION_SPECIFIC_16
1547-
VM_MEMORY_ASL
1548-
VM_MEMORY_ASSETSD
1549-
VM_MEMORY_ATS
1550-
VM_MEMORY_CARBON
1551-
VM_MEMORY_CGIMAGE
1552-
VM_MEMORY_COREDATA
1553-
VM_MEMORY_COREDATA_OBJECTIDS
1554-
VM_MEMORY_COREGRAPHICS
1555-
VM_MEMORY_COREGRAPHICS_BACKINGSTORES
1556-
VM_MEMORY_COREGRAPHICS_DATA
1557-
VM_MEMORY_COREGRAPHICS_FRAMEBUFFERS
1558-
VM_MEMORY_COREGRAPHICS_MISC
1559-
VM_MEMORY_COREGRAPHICS_SHARED
1560-
VM_MEMORY_COREGRAPHICS_XALLOC
1561-
VM_MEMORY_COREIMAGE
1562-
VM_MEMORY_COREPROFILE
1563-
VM_MEMORY_CORESERVICES
1564-
VM_MEMORY_COREUI
1565-
VM_MEMORY_COREUIFILE
1566-
VM_MEMORY_CORPSEINFO
1567-
VM_MEMORY_DHMM
1568-
VM_MEMORY_DYLD
1569-
VM_MEMORY_DYLD_MALLOC
1570-
VM_MEMORY_DYLIB
1571-
VM_MEMORY_FOUNDATION
1572-
VM_MEMORY_GENEALOGY
1573-
VM_MEMORY_GLSL
1574-
VM_MEMORY_GUARD
1575-
VM_MEMORY_IMAGEIO
1576-
VM_MEMORY_IOKIT
1577-
VM_MEMORY_JAVA
1578-
VM_MEMORY_JAVASCRIPT_CORE
1579-
VM_MEMORY_JAVASCRIPT_JIT_EXECUTABLE_ALLOCATOR
1580-
VM_MEMORY_JAVASCRIPT_JIT_REGISTER_FILE
1581-
VM_MEMORY_LAYERKIT
1582-
VM_MEMORY_LIBDISPATCH
1583-
VM_MEMORY_MACH_MSG
1584-
VM_MEMORY_MALLOC
1585-
VM_MEMORY_MALLOC_HUGE
1586-
VM_MEMORY_MALLOC_LARGE
1587-
VM_MEMORY_MALLOC_LARGE_REUSABLE
1588-
VM_MEMORY_MALLOC_LARGE_REUSED
1589-
VM_MEMORY_MALLOC_NANO
1590-
VM_MEMORY_MALLOC_SMALL
1591-
VM_MEMORY_MALLOC_TINY
1592-
VM_MEMORY_OBJC_DISPATCHERS
1593-
VM_MEMORY_OPENCL
1594-
VM_MEMORY_OS_ALLOC_ONCE
1595-
VM_MEMORY_RAWCAMERA
1596-
VM_MEMORY_REALLOC
1597-
VM_MEMORY_SBRK
1598-
VM_MEMORY_SCENEKIT
1599-
VM_MEMORY_SHARED_PMAP
1600-
VM_MEMORY_SKYWALK
1601-
VM_MEMORY_SQLITE
1602-
VM_MEMORY_STACK
1603-
VM_MEMORY_SWIFT_METADATA
1604-
VM_MEMORY_SWIFT_RUNTIME
1605-
VM_MEMORY_TCMALLOC
1606-
VM_MEMORY_UNSHARED_PMAP
1607-
VM_MEMORY_WEBCORE_PURGEABLE_BUFFERS
16081520
VM_METER
16091521
VM_PROT_EXECUTE
16101522
VM_PROT_NONE
@@ -1685,7 +1597,6 @@ _IOFBF
16851597
_IOLBF
16861598
_IONBF
16871599
_NSGetEnviron
1688-
_NSGetExecutablePath
16891600
_POSIX_VDISABLE
16901601
_PTHREAD_COND_SIG_init
16911602
_PTHREAD_MUTEX_SIG_init
@@ -1820,10 +1731,6 @@ __PTHREAD_RWLOCKATTR_SIZE__
18201731
__PTHREAD_RWLOCK_SIZE__
18211732
__darwin_mcontext64
18221733
__error
1823-
_dyld_get_image_header
1824-
_dyld_get_image_name
1825-
_dyld_get_image_vmaddr_slide
1826-
_dyld_image_count
18271734
abs
18281735
acct
18291736
aio_cancel
@@ -1985,18 +1892,6 @@ lockf
19851892
log2phys
19861893
login_tty
19871894
lutimes
1988-
mach_absolute_time
1989-
mach_header
1990-
mach_header_64
1991-
mach_host_self
1992-
mach_port_t
1993-
mach_thread_self
1994-
mach_timebase_info
1995-
mach_timebase_info_data_t
1996-
mach_vm_address_t
1997-
mach_vm_map
1998-
mach_vm_offset_t
1999-
mach_vm_size_t
20001895
madvise
20011896
malloc_default_zone
20021897
malloc_good_size
@@ -2121,8 +2016,6 @@ pthread_cancel
21212016
pthread_condattr_getpshared
21222017
pthread_condattr_setpshared
21232018
pthread_cpu_number_np
2124-
pthread_create_from_mach_thread
2125-
pthread_from_mach_thread_np
21262019
pthread_get_stackaddr_np
21272020
pthread_get_stacksize_np
21282021
pthread_getname_np

src/macros.rs

-34
Original file line numberDiff line numberDiff line change
@@ -251,40 +251,6 @@ macro_rules! __item {
251251
};
252252
}
253253

254-
// This macro is used to deprecate items that should be accessed via the mach2 crate
255-
macro_rules! deprecated_mach {
256-
(pub const $id:ident: $ty:ty = $expr:expr;) => {
257-
#[deprecated(
258-
since = "0.2.55",
259-
note = "Use the `mach2` crate instead",
260-
)]
261-
#[allow(deprecated)]
262-
pub const $id: $ty = $expr;
263-
};
264-
($(pub const $id:ident: $ty:ty = $expr:expr;)*) => {
265-
$(
266-
deprecated_mach!(
267-
pub const $id: $ty = $expr;
268-
);
269-
)*
270-
};
271-
(pub type $id:ident = $ty:ty;) => {
272-
#[deprecated(
273-
since = "0.2.55",
274-
note = "Use the `mach2` crate instead",
275-
)]
276-
#[allow(deprecated)]
277-
pub type $id = $ty;
278-
};
279-
($(pub type $id:ident = $ty:ty;)*) => {
280-
$(
281-
deprecated_mach!(
282-
pub type $id = $ty;
283-
);
284-
)*
285-
}
286-
}
287-
288254
macro_rules! ptr_addr_of {
289255
($place:expr) => {
290256
::core::ptr::addr_of!($place)

0 commit comments

Comments
 (0)