Merge pull request #3533 from JohnTitor/rm-mach

Remove mach-related items

Author: JohnTitor

libc-test/build.rs

@@ -202,14 +202,6 @@ fn test_apple(target: &str) {
         "libproc.h",
         "limits.h",
         "locale.h",
-        "mach-o/dyld.h",
-        "mach/mach_init.h",
-        "mach/mach.h",
-        "mach/mach_time.h",
-        "mach/mach_types.h",
-        "mach/mach_vm.h",
-        "mach/thread_act.h",
-        "mach/thread_policy.h",
         "malloc/malloc.h",
         "net/bpf.h",
         "net/dlil.h",
@@ -319,10 +311,6 @@ fn test_apple(target: &str) {
     });
 
     cfg.skip_const(move |name| {
-        // They're declared via `deprecated_mach` and we don't support it anymore.
-        if name.starts_with("VM_FLAGS_") {
-            return true;
-        }
         match name {
             // These OSX constants are removed in Sierra.
             // https://developer.apple.com/library/content/releasenotes/General/APIDiffsMacOS10_12/Swift/Darwin.html

libc-test/semver/apple.txt

@@ -1353,9 +1353,6 @@ STA_RONLY
 STA_UNSYNC
 ST_NOSUID
 ST_RDONLY
-SUPERPAGE_NONE
-SUPERPAGE_SIZE_2MB
-SUPERPAGE_SIZE_ANY
 SYSPROTO_CONTROL
 SYSPROTO_EVENT
 S_IEXEC
@@ -1516,95 +1513,10 @@ UTUN_OPT_IFNAME
 VDISCARD
 VDSUSP
 VLNEXT
-VM_FLAGS_ALIAS_MASK
-VM_FLAGS_ANYWHERE
-VM_FLAGS_FIXED
-VM_FLAGS_NO_CACHE
-VM_FLAGS_OVERWRITE
-VM_FLAGS_PURGABLE
-VM_FLAGS_RANDOM_ADDR
-VM_FLAGS_RESILIENT_CODESIGN
-VM_FLAGS_RESILIENT_MEDIA
-VM_FLAGS_RETURN_4K_DATA_ADDR
-VM_FLAGS_RETURN_DATA_ADDR
-VM_FLAGS_SUPERPAGE_MASK
-VM_FLAGS_SUPERPAGE_NONE
-VM_FLAGS_SUPERPAGE_SHIFT
-VM_FLAGS_SUPERPAGE_SIZE_2MB
-VM_FLAGS_SUPERPAGE_SIZE_ANY
-VM_FLAGS_USER_ALLOCATE
-VM_FLAGS_USER_MAP
-VM_FLAGS_USER_REMAP
 VM_LOADAVG
 VM_MACHFACTOR
 VM_MAKE_TAG
 VM_MAXID
-VM_MEMORY_ACCELERATE
-VM_MEMORY_ANALYSIS_TOOL
-VM_MEMORY_APPKIT
-VM_MEMORY_APPLICATION_SPECIFIC_1
-VM_MEMORY_APPLICATION_SPECIFIC_16
-VM_MEMORY_ASL
-VM_MEMORY_ASSETSD
-VM_MEMORY_ATS
-VM_MEMORY_CARBON
-VM_MEMORY_CGIMAGE
-VM_MEMORY_COREDATA
-VM_MEMORY_COREDATA_OBJECTIDS
-VM_MEMORY_COREGRAPHICS
-VM_MEMORY_COREGRAPHICS_BACKINGSTORES
-VM_MEMORY_COREGRAPHICS_DATA
-VM_MEMORY_COREGRAPHICS_FRAMEBUFFERS
-VM_MEMORY_COREGRAPHICS_MISC
-VM_MEMORY_COREGRAPHICS_SHARED
-VM_MEMORY_COREGRAPHICS_XALLOC
-VM_MEMORY_COREIMAGE
-VM_MEMORY_COREPROFILE
-VM_MEMORY_CORESERVICES
-VM_MEMORY_COREUI
-VM_MEMORY_COREUIFILE
-VM_MEMORY_CORPSEINFO
-VM_MEMORY_DHMM
-VM_MEMORY_DYLD
-VM_MEMORY_DYLD_MALLOC
-VM_MEMORY_DYLIB
-VM_MEMORY_FOUNDATION
-VM_MEMORY_GENEALOGY
-VM_MEMORY_GLSL
-VM_MEMORY_GUARD
-VM_MEMORY_IMAGEIO
-VM_MEMORY_IOKIT
-VM_MEMORY_JAVA
-VM_MEMORY_JAVASCRIPT_CORE
-VM_MEMORY_JAVASCRIPT_JIT_EXECUTABLE_ALLOCATOR
-VM_MEMORY_JAVASCRIPT_JIT_REGISTER_FILE
-VM_MEMORY_LAYERKIT
-VM_MEMORY_LIBDISPATCH
-VM_MEMORY_MACH_MSG
-VM_MEMORY_MALLOC
-VM_MEMORY_MALLOC_HUGE
-VM_MEMORY_MALLOC_LARGE
-VM_MEMORY_MALLOC_LARGE_REUSABLE
-VM_MEMORY_MALLOC_LARGE_REUSED
-VM_MEMORY_MALLOC_NANO
-VM_MEMORY_MALLOC_SMALL
-VM_MEMORY_MALLOC_TINY
-VM_MEMORY_OBJC_DISPATCHERS
-VM_MEMORY_OPENCL
-VM_MEMORY_OS_ALLOC_ONCE
-VM_MEMORY_RAWCAMERA
-VM_MEMORY_REALLOC
-VM_MEMORY_SBRK
-VM_MEMORY_SCENEKIT
-VM_MEMORY_SHARED_PMAP
-VM_MEMORY_SKYWALK
-VM_MEMORY_SQLITE
-VM_MEMORY_STACK
-VM_MEMORY_SWIFT_METADATA
-VM_MEMORY_SWIFT_RUNTIME
-VM_MEMORY_TCMALLOC
-VM_MEMORY_UNSHARED_PMAP
-VM_MEMORY_WEBCORE_PURGEABLE_BUFFERS
 VM_METER
 VM_PROT_EXECUTE
 VM_PROT_NONE
@@ -1685,7 +1597,6 @@ _IOFBF
 _IOLBF
 _IONBF
 _NSGetEnviron
-_NSGetExecutablePath
 _POSIX_VDISABLE
 _PTHREAD_COND_SIG_init
 _PTHREAD_MUTEX_SIG_init
@@ -1820,10 +1731,6 @@ __PTHREAD_RWLOCKATTR_SIZE__
 __PTHREAD_RWLOCK_SIZE__
 __darwin_mcontext64
 __error
-_dyld_get_image_header
-_dyld_get_image_name
-_dyld_get_image_vmaddr_slide
-_dyld_image_count
 abs
 acct
 aio_cancel
@@ -1985,18 +1892,6 @@ lockf
 log2phys
 login_tty
 lutimes
-mach_absolute_time
-mach_header
-mach_header_64
-mach_host_self
-mach_port_t
-mach_thread_self
-mach_timebase_info
-mach_timebase_info_data_t
-mach_vm_address_t
-mach_vm_map
-mach_vm_offset_t
-mach_vm_size_t
 madvise
 malloc_default_zone
 malloc_good_size
@@ -2121,8 +2016,6 @@ pthread_cancel
 pthread_condattr_getpshared
 pthread_condattr_setpshared
 pthread_cpu_number_np
-pthread_create_from_mach_thread
-pthread_from_mach_thread_np
 pthread_get_stackaddr_np
 pthread_get_stacksize_np
 pthread_getname_np

src/macros.rs

@@ -251,40 +251,6 @@ macro_rules! __item {
     };
 }
 
-// This macro is used to deprecate items that should be accessed via the mach2 crate
-macro_rules! deprecated_mach {
-    (pub const $id:ident: $ty:ty = $expr:expr;) => {
-        #[deprecated(
-            since = "0.2.55",
-            note = "Use the `mach2` crate instead",
-        )]
-        #[allow(deprecated)]
-        pub const $id: $ty = $expr;
-    };
-    ($(pub const $id:ident: $ty:ty = $expr:expr;)*) => {
-        $(
-            deprecated_mach!(
-                pub const $id: $ty = $expr;
-            );
-        )*
-    };
-    (pub type $id:ident = $ty:ty;) => {
-        #[deprecated(
-            since = "0.2.55",
-            note = "Use the `mach2` crate instead",
-        )]
-        #[allow(deprecated)]
-        pub type $id = $ty;
-    };
-    ($(pub type $id:ident = $ty:ty;)*) => {
-        $(
-            deprecated_mach!(
-                pub type $id = $ty;
-            );
-        )*
-    }
-}
-
 macro_rules! ptr_addr_of {
     ($place:expr) => {
         ::core::ptr::addr_of!($place)