Manual edition migration adjustments

Author: eduardosm

src/fuchsia/mod.rs

@@ -508,9 +508,9 @@ s! {
         #[cfg(target_endian = "little")]
         pub f_fsid: crate::c_ulong,
         #[cfg(all(target_pointer_width = "32", not(target_arch = "x86_64")))]
-        __f_unused: ::c_int,
+        __f_unused: crate::c_int,
         #[cfg(target_endian = "big")]
-        pub f_fsid: ::c_ulong,
+        pub f_fsid: crate::c_ulong,
         pub f_flag: crate::c_ulong,
         pub f_namemax: crate::c_ulong,
         __f_spare: [crate::c_int; 6],
@@ -2062,7 +2062,7 @@ pub const WEXITED: crate::c_int = 0x00000004;
 pub const WCONTINUED: crate::c_int = 0x00000008;
 pub const WNOWAIT: crate::c_int = 0x01000000;
 
-// ::Options set using PTRACE_SETOPTIONS.
+// Options set using PTRACE_SETOPTIONS.
 pub const PTRACE_O_TRACESYSGOOD: crate::c_int = 0x00000001;
 pub const PTRACE_O_TRACEFORK: crate::c_int = 0x00000002;
 pub const PTRACE_O_TRACEVFORK: crate::c_int = 0x00000004;
@@ -2084,7 +2084,7 @@ pub const PTRACE_EVENT_VFORK_DONE: crate::c_int = 5;
 pub const PTRACE_EVENT_EXIT: crate::c_int = 6;
 pub const PTRACE_EVENT_SECCOMP: crate::c_int = 7;
 // PTRACE_EVENT_STOP was added to glibc in 2.26
-// pub const PTRACE_EVENT_STOP: ::c_int = 128;
+// pub const PTRACE_EVENT_STOP: crate::c_int = 128;
 
 pub const __WNOTHREAD: crate::c_int = 0x20000000;
 pub const __WALL: crate::c_int = 0x40000000;

src/unix/bsd/apple/mod.rs

@@ -353,7 +353,7 @@ s! {
         pub si_status: crate::c_int,
         pub si_addr: *mut crate::c_void,
         //Requires it to be union for tests
-        //pub si_value: ::sigval,
+        //pub si_value: crate::sigval,
         _pad: [usize; 9],
     }
 

src/unix/bsd/freebsdlike/freebsd/freebsd11/mod.rs

@@ -452,17 +452,17 @@ f! {
 }
 
 extern "C" {
-    // Return type ::c_int was removed in FreeBSD 12
+    // Return type c_int was removed in FreeBSD 12
     pub fn setgrent() -> crate::c_int;
 
     // Type of `addr` argument changed from `const void*` to `void*`
     // in FreeBSD 12
     pub fn mprotect(addr: *const crate::c_void, len: crate::size_t, prot: crate::c_int) -> crate::c_int;
 
-    // Return type ::c_int was removed in FreeBSD 12
+    // Return type c_int was removed in FreeBSD 12
     pub fn freelocale(loc: crate::locale_t) -> crate::c_int;
 
-    // Return type ::c_int changed to ::ssize_t in FreeBSD 12:
+    // Return type c_int changed to ssize_t in FreeBSD 12:
     pub fn msgrcv(
         msqid: crate::c_int,
         msgp: *mut crate::c_void,

src/unix/bsd/freebsdlike/freebsd/mod.rs

@@ -4125,7 +4125,7 @@ pub const KVME_TYPE_DEAD: crate::c_int = 6;
 pub const KVME_TYPE_SG: crate::c_int = 7;
 pub const KVME_TYPE_MGTDEVICE: crate::c_int = 8;
 // Present in `sys/user.h` but is undefined for whatever reason...
-// pub const KVME_TYPE_GUARD: ::c_int = 9;
+// pub const KVME_TYPE_GUARD: crate::c_int = 9;
 pub const KVME_TYPE_UNKNOWN: crate::c_int = 255;
 pub const KVME_PROT_READ: crate::c_int = 0x00000001;
 pub const KVME_PROT_WRITE: crate::c_int = 0x00000002;

src/unix/bsd/netbsdlike/netbsd/mod.rs

@@ -1829,8 +1829,8 @@ pub const _SC_CPUTIME: crate::c_int = 90;
 pub const _SC_THREAD_CPUTIME: crate::c_int = 91;
 pub const _SC_DELAYTIMER_MAX: crate::c_int = 92;
 // These two variables will be supported in NetBSD 8.0
-// pub const _SC_SIGQUEUE_MAX : ::c_int = 93;
-// pub const _SC_REALTIME_SIGNALS : ::c_int = 94;
+// pub const _SC_SIGQUEUE_MAX: crate::c_int = 93;
+// pub const _SC_REALTIME_SIGNALS: crate::c_int = 94;
 pub const _SC_PHYS_PAGES: crate::c_int = 121;
 pub const _SC_NPROCESSORS_CONF: crate::c_int = 1001;
 pub const _SC_NPROCESSORS_ONLN: crate::c_int = 1002;
@@ -2296,8 +2296,8 @@ pub const SOCK_CLOEXEC: crate::c_int = 0x10000000;
 pub const SOCK_NONBLOCK: crate::c_int = 0x20000000;
 
 // Uncomment on next NetBSD release
-// pub const FIOSEEKDATA: ::c_ulong = 0xc0086661;
-// pub const FIOSEEKHOLE: ::c_ulong = 0xc0086662;
+// pub const FIOSEEKDATA: crate::c_ulong = 0xc0086661;
+// pub const FIOSEEKHOLE: crate::c_ulong = 0xc0086662;
 pub const OFIOGETBMAP: crate::c_ulong = 0xc004667a;
 pub const FIOGETBMAP: crate::c_ulong = 0xc008667a;
 pub const FIONWRITE: crate::c_ulong = 0x40046679;

src/unix/bsd/netbsdlike/openbsd/arm.rs

@@ -2,6 +2,6 @@ pub type c_long = i32;
 pub type c_ulong = u32;
 pub type c_char = u8;
 
-pub(crate) const _ALIGNBYTES: usize = ::mem::size_of::<::c_double>() - 1;
+pub(crate) const _ALIGNBYTES: usize = core::mem::size_of::<crate::c_double>() - 1;
 
 pub const _MAX_PAGE_SHIFT: u32 = 12;

src/unix/linux_like/android/b32/x86/mod.rs

@@ -289,11 +289,11 @@ pub const SYS_setfsuid: crate::c_long = 138;
 pub const SYS_setfsgid: crate::c_long = 139;
 // FIXME: SYS__llseek is in the NDK sources but for some reason is
 //        not available in the tests
-// pub const SYS__llseek: ::c_long = 140;
+// pub const SYS__llseek: crate::c_long = 140;
 pub const SYS_getdents: crate::c_long = 141;
 // FIXME: SYS__newselect is in the NDK sources but for some reason is
 //        not available in the tests
-// pub const SYS__newselect: ::c_long = 142;
+// pub const SYS__newselect: crate::c_long = 142;
 pub const SYS_flock: crate::c_long = 143;
 pub const SYS_msync: crate::c_long = 144;
 pub const SYS_readv: crate::c_long = 145;
@@ -302,7 +302,7 @@ pub const SYS_getsid: crate::c_long = 147;
 pub const SYS_fdatasync: crate::c_long = 148;
 // FIXME: SYS__llseek is in the NDK sources but for some reason is
 //        not available in the tests
-// pub const SYS__sysctl: ::c_long = 149;
+// pub const SYS__sysctl: crate::c_long = 149;
 pub const SYS_mlock: crate::c_long = 150;
 pub const SYS_munlock: crate::c_long = 151;
 pub const SYS_mlockall: crate::c_long = 152;

src/unix/linux_like/android/b64/x86_64/mod.rs

@@ -552,7 +552,7 @@ pub const SYS_modify_ldt: crate::c_long = 154;
 pub const SYS_pivot_root: crate::c_long = 155;
 // FIXME: SYS__sysctl is in the NDK sources but for some reason is
 //        not available in the tests
-// pub const SYS__sysctl: ::c_long = 156;
+// pub const SYS__sysctl: crate::c_long = 156;
 pub const SYS_prctl: crate::c_long = 157;
 pub const SYS_arch_prctl: crate::c_long = 158;
 pub const SYS_adjtimex: crate::c_long = 159;

src/unix/linux_like/android/mod.rs

@@ -1553,10 +1553,10 @@ pub const SO_SNDBUFFORCE: crate::c_int = 32;
 pub const SO_RCVBUFFORCE: crate::c_int = 33;
 pub const SO_PASSSEC: crate::c_int = 34;
 pub const SO_TIMESTAMPNS: crate::c_int = 35;
-// pub const SO_TIMESTAMPNS_OLD: ::c_int = 35;
+// pub const SO_TIMESTAMPNS_OLD: crate::c_int = 35;
 pub const SO_MARK: crate::c_int = 36;
 pub const SO_TIMESTAMPING: crate::c_int = 37;
-// pub const SO_TIMESTAMPING_OLD: ::c_int = 37;
+// pub const SO_TIMESTAMPING_OLD: crate::c_int = 37;
 pub const SO_PROTOCOL: crate::c_int = 38;
 pub const SO_DOMAIN: crate::c_int = 39;
 pub const SO_RXQ_OVFL: crate::c_int = 40;
@@ -1569,7 +1569,7 @@ pub const SO_TIMESTAMPNS_NEW: crate::c_int = 64;
 pub const SO_TIMESTAMPING_NEW: crate::c_int = 65;
 
 // Defined in unix/linux_like/mod.rs
-// pub const SCM_TIMESTAMP: ::c_int = SO_TIMESTAMP;
+// pub const SCM_TIMESTAMP: crate::c_int = SO_TIMESTAMP;
 pub const SCM_TIMESTAMPNS: crate::c_int = SO_TIMESTAMPNS;
 pub const SCM_TIMESTAMPING: crate::c_int = SO_TIMESTAMPING;
 
@@ -1723,8 +1723,8 @@ cfg_if! {
         target_arch = "powerpc",
         target_arch = "powerpc64"
     ))] {
-        pub const FICLONE: ::c_int = 0x80049409;
-        pub const FICLONERANGE: ::c_int = 0x8020940D;
+        pub const FICLONE: crate::c_int = 0x80049409;
+        pub const FICLONERANGE: crate::c_int = 0x8020940D;
     }
 }
 
@@ -2107,12 +2107,12 @@ pub const NFQA_SECCTX: crate::c_int = 18;
  make the tests fail. Enable them once musl has them.
 
  See https://github.com/rust-lang/libc/pull/1628 for more details.
-pub const NFQA_VLAN: ::c_int = 19;
-pub const NFQA_L2HDR: ::c_int = 20;
+pub const NFQA_VLAN: crate::c_int = 19;
+pub const NFQA_L2HDR: crate::c_int = 20;
 
-pub const NFQA_VLAN_UNSPEC: ::c_int = 0;
-pub const NFQA_VLAN_PROTO: ::c_int = 1;
-pub const NFQA_VLAN_TCI: ::c_int = 2;
+pub const NFQA_VLAN_UNSPEC: crate::c_int = 0;
+pub const NFQA_VLAN_PROTO: crate::c_int = 1;
+pub const NFQA_VLAN_TCI: crate::c_int = 2;
 */
 
 pub const NFQNL_CFG_CMD_NONE: crate::c_int = 0;
@@ -2713,7 +2713,7 @@ pub const ETH_P_RARP: crate::c_int = 0x8035;
 pub const ETH_P_ATALK: crate::c_int = 0x809B;
 pub const ETH_P_AARP: crate::c_int = 0x80F3;
 pub const ETH_P_8021Q: crate::c_int = 0x8100;
-/* see rust-lang/libc#924 pub const ETH_P_ERSPAN: ::c_int = 0x88BE;*/
+/* see rust-lang/libc#924 pub const ETH_P_ERSPAN: crate::c_int = 0x88BE;*/
 pub const ETH_P_IPX: crate::c_int = 0x8137;
 pub const ETH_P_IPV6: crate::c_int = 0x86DD;
 pub const ETH_P_PAUSE: crate::c_int = 0x8808;
@@ -2738,18 +2738,18 @@ pub const ETH_P_1588: crate::c_int = 0x88F7;
 pub const ETH_P_NCSI: crate::c_int = 0x88F8;
 pub const ETH_P_PRP: crate::c_int = 0x88FB;
 pub const ETH_P_FCOE: crate::c_int = 0x8906;
-/* see rust-lang/libc#924 pub const ETH_P_IBOE: ::c_int = 0x8915;*/
+/* see rust-lang/libc#924 pub const ETH_P_IBOE: crate::c_int = 0x8915;*/
 pub const ETH_P_TDLS: crate::c_int = 0x890D;
 pub const ETH_P_FIP: crate::c_int = 0x8914;
 pub const ETH_P_80221: crate::c_int = 0x8917;
 pub const ETH_P_HSR: crate::c_int = 0x892F;
-/* see rust-lang/libc#924 pub const ETH_P_NSH: ::c_int = 0x894F;*/
+/* see rust-lang/libc#924 pub const ETH_P_NSH: crate::c_int = 0x894F;*/
 pub const ETH_P_LOOPBACK: crate::c_int = 0x9000;
 pub const ETH_P_QINQ1: crate::c_int = 0x9100;
 pub const ETH_P_QINQ2: crate::c_int = 0x9200;
 pub const ETH_P_QINQ3: crate::c_int = 0x9300;
 pub const ETH_P_EDSA: crate::c_int = 0xDADA;
-/* see rust-lang/libc#924 pub const ETH_P_IFE: ::c_int = 0xED3E;*/
+/* see rust-lang/libc#924 pub const ETH_P_IFE: crate::c_int = 0xED3E;*/
 pub const ETH_P_AF_IUCV: crate::c_int = 0xFBFB;
 pub const ETH_P_802_3_MIN: crate::c_int = 0x0600;
 pub const ETH_P_802_3: crate::c_int = 0x0001;
@@ -2777,7 +2777,7 @@ pub const ETH_P_PHONET: crate::c_int = 0x00F5;
 pub const ETH_P_IEEE802154: crate::c_int = 0x00F6;
 pub const ETH_P_CAIF: crate::c_int = 0x00F7;
 pub const ETH_P_XDSA: crate::c_int = 0x00F8;
-/* see rust-lang/libc#924 pub const ETH_P_MAP: ::c_int = 0x00F9;*/
+/* see rust-lang/libc#924 pub const ETH_P_MAP: crate::c_int = 0x00F9;*/
 // end android/platform/bionic/libc/kernel/uapi/linux/if_ether.h
 
 // start android/platform/bionic/libc/kernel/uapi/linux/neighbour.h
@@ -3591,7 +3591,7 @@ cfg_if! {
     if #[cfg(not(target_arch = "s390x"))] {
         pub const XFS_SUPER_MAGIC: crate::c_long = 0x58465342;
     } else if #[cfg(target_arch = "s390x")] {
-        pub const XFS_SUPER_MAGIC: ::c_uint = 0x58465342;
+        pub const XFS_SUPER_MAGIC: crate::c_uint = 0x58465342;
     }
 }
 

src/unix/linux_like/linux/arch/generic/mod.rs

@@ -18,7 +18,7 @@ s! {
 pub const SOL_SOCKET: crate::c_int = 1;
 
 // Defined in unix/linux_like/mod.rs
-// pub const SO_DEBUG: ::c_int = 1;
+// pub const SO_DEBUG: crate::c_int = 1;
 pub const SO_REUSEADDR: crate::c_int = 2;
 pub const SO_TYPE: crate::c_int = 3;
 pub const SO_ERROR: crate::c_int = 4;
@@ -39,8 +39,8 @@ pub const SO_RCVLOWAT: crate::c_int = 18;
 pub const SO_SNDLOWAT: crate::c_int = 19;
 pub const SO_RCVTIMEO: crate::c_int = 20;
 pub const SO_SNDTIMEO: crate::c_int = 21;
-// pub const SO_RCVTIMEO_OLD: ::c_int = 20;
-// pub const SO_SNDTIMEO_OLD: ::c_int = 21;
+// pub const SO_RCVTIMEO_OLD: crate::c_int = 20;
+// pub const SO_SNDTIMEO_OLD: crate::c_int = 21;
 pub const SO_SECURITY_AUTHENTICATION: crate::c_int = 22;
 pub const SO_SECURITY_ENCRYPTION_TRANSPORT: crate::c_int = 23;
 pub const SO_SECURITY_ENCRYPTION_NETWORK: crate::c_int = 24;
@@ -50,17 +50,17 @@ pub const SO_DETACH_FILTER: crate::c_int = 27;
 pub const SO_GET_FILTER: crate::c_int = SO_ATTACH_FILTER;
 pub const SO_PEERNAME: crate::c_int = 28;
 pub const SO_TIMESTAMP: crate::c_int = 29;
-// pub const SO_TIMESTAMP_OLD: ::c_int = 29;
+// pub const SO_TIMESTAMP_OLD: crate::c_int = 29;
 pub const SO_ACCEPTCONN: crate::c_int = 30;
 pub const SO_PEERSEC: crate::c_int = 31;
 pub const SO_SNDBUFFORCE: crate::c_int = 32;
 pub const SO_RCVBUFFORCE: crate::c_int = 33;
 pub const SO_PASSSEC: crate::c_int = 34;
 pub const SO_TIMESTAMPNS: crate::c_int = 35;
-// pub const SO_TIMESTAMPNS_OLD: ::c_int = 35;
+// pub const SO_TIMESTAMPNS_OLD: crate::c_int = 35;
 pub const SO_MARK: crate::c_int = 36;
 pub const SO_TIMESTAMPING: crate::c_int = 37;
-// pub const SO_TIMESTAMPING_OLD: ::c_int = 37;
+// pub const SO_TIMESTAMPING_OLD: crate::c_int = 37;
 pub const SO_PROTOCOL: crate::c_int = 38;
 pub const SO_DOMAIN: crate::c_int = 39;
 pub const SO_RXQ_OVFL: crate::c_int = 40;
@@ -110,8 +110,8 @@ cfg_if! {
         pub const SO_DETACH_REUSEPORT_BPF: crate::c_int = 68;
     }
 }
-// pub const SO_PREFER_BUSY_POLL: ::c_int = 69;
-// pub const SO_BUSY_POLL_BUDGET: ::c_int = 70;
+// pub const SO_PREFER_BUSY_POLL: crate::c_int = 69;
+// pub const SO_BUSY_POLL_BUDGET: crate::c_int = 70;
 
 cfg_if! {
     if #[cfg(any(
@@ -130,7 +130,7 @@ cfg_if! {
 }
 
 // Defined in unix/linux_like/mod.rs
-// pub const SCM_TIMESTAMP: ::c_int = SO_TIMESTAMP;
+// pub const SCM_TIMESTAMP: crate::c_int = SO_TIMESTAMP;
 pub const SCM_TIMESTAMPNS: crate::c_int = SO_TIMESTAMPNS;
 pub const SCM_TIMESTAMPING: crate::c_int = SO_TIMESTAMPING;
 
@@ -196,8 +196,8 @@ pub const TIOCGPKT: crate::Ioctl = 0x80045438;
 pub const TIOCGPTLCK: crate::Ioctl = 0x80045439;
 pub const TIOCGEXCL: crate::Ioctl = 0x80045440;
 pub const TIOCGPTPEER: crate::Ioctl = 0x5441;
-// pub const TIOCGISO7816: ::Ioctl = 0x80285442;
-// pub const TIOCSISO7816: ::Ioctl = 0xc0285443;
+// pub const TIOCGISO7816: crate::Ioctl = 0x80285442;
+// pub const TIOCSISO7816: crate::Ioctl = 0xc0285443;
 pub const FIONCLEX: crate::Ioctl = 0x5450;
 pub const FIOCLEX: crate::Ioctl = 0x5451;
 pub const FIOASYNC: crate::Ioctl = 0x5452;