Merge pull request #19214 from mlugg/fuck-usingnamespace

std: fuck usingnamespace

Author: mlugg

CMakeLists.txt

@@ -291,7 +291,8 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/lib/std/os/linux/errno/generic.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/os/linux/x86_64.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/os/linux.zig"
-    "${CMAKE_SOURCE_DIR}/lib/std/os/linux/io_uring.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/os/linux/IoUring.zig"
+    "${CMAKE_SOURCE_DIR}/lib/std/os/linux/io_uring_sqe.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/os/linux/x86_64.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/os/windows.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/os/windows/ntstatus.zig"

lib/std/c.zig

@@ -1494,38 +1494,33 @@ pub const speed_t = switch (native_os) {
 pub const whence_t = if (native_os == .wasi) std.os.wasi.whence_t else c_int;
 
 // Unix-like systems
-pub usingnamespace switch (native_os) {
-    .netbsd, .windows => struct {},
-    else => struct {
-        pub const DIR = opaque {};
-        pub extern "c" fn opendir(pathname: [*:0]const u8) ?*DIR;
-        pub extern "c" fn fdopendir(fd: c_int) ?*DIR;
-        pub extern "c" fn rewinddir(dp: *DIR) void;
-        pub extern "c" fn closedir(dp: *DIR) c_int;
-        pub extern "c" fn telldir(dp: *DIR) c_long;
-        pub extern "c" fn seekdir(dp: *DIR, loc: c_long) void;
+pub const DIR = opaque {};
+pub extern "c" fn opendir(pathname: [*:0]const u8) ?*DIR;
+pub extern "c" fn fdopendir(fd: c_int) ?*DIR;
+pub extern "c" fn rewinddir(dp: *DIR) void;
+pub extern "c" fn closedir(dp: *DIR) c_int;
+pub extern "c" fn telldir(dp: *DIR) c_long;
+pub extern "c" fn seekdir(dp: *DIR, loc: c_long) void;
 
-        pub extern "c" fn clock_gettime(clk_id: c_int, tp: *c.timespec) c_int;
-        pub extern "c" fn clock_getres(clk_id: c_int, tp: *c.timespec) c_int;
-        pub extern "c" fn gettimeofday(noalias tv: ?*c.timeval, noalias tz: ?*c.timezone) c_int;
-        pub extern "c" fn nanosleep(rqtp: *const c.timespec, rmtp: ?*c.timespec) c_int;
+pub extern "c" fn clock_gettime(clk_id: c_int, tp: *c.timespec) c_int;
+pub extern "c" fn clock_getres(clk_id: c_int, tp: *c.timespec) c_int;
+pub extern "c" fn gettimeofday(noalias tv: ?*c.timeval, noalias tz: ?*c.timezone) c_int;
+pub extern "c" fn nanosleep(rqtp: *const c.timespec, rmtp: ?*c.timespec) c_int;
 
-        pub extern "c" fn getrusage(who: c_int, usage: *c.rusage) c_int;
+pub extern "c" fn getrusage(who: c_int, usage: *c.rusage) c_int;
 
-        pub extern "c" fn sched_yield() c_int;
+pub extern "c" fn sched_yield() c_int;
 
-        pub extern "c" fn sigaction(sig: c_int, noalias act: ?*const c.Sigaction, noalias oact: ?*c.Sigaction) c_int;
-        pub extern "c" fn sigprocmask(how: c_int, noalias set: ?*const c.sigset_t, noalias oset: ?*c.sigset_t) c_int;
-        pub extern "c" fn sigfillset(set: ?*c.sigset_t) void;
-        pub extern "c" fn sigwait(set: ?*c.sigset_t, sig: ?*c_int) c_int;
+pub extern "c" fn sigaction(sig: c_int, noalias act: ?*const c.Sigaction, noalias oact: ?*c.Sigaction) c_int;
+pub extern "c" fn sigprocmask(how: c_int, noalias set: ?*const c.sigset_t, noalias oset: ?*c.sigset_t) c_int;
+pub extern "c" fn sigfillset(set: ?*c.sigset_t) void;
+pub extern "c" fn sigwait(set: ?*c.sigset_t, sig: ?*c_int) c_int;
 
-        pub extern "c" fn socket(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
+pub extern "c" fn socket(domain: c_uint, sock_type: c_uint, protocol: c_uint) c_int;
 
-        pub extern "c" fn alarm(seconds: c_uint) c_uint;
+pub extern "c" fn alarm(seconds: c_uint) c_uint;
 
-        pub extern "c" fn msync(addr: *align(page_size) const anyopaque, len: usize, flags: c_int) c_int;
-    },
-};
+pub extern "c" fn msync(addr: *align(page_size) const anyopaque, len: usize, flags: c_int) c_int;
 
 pub const fstat = switch (native_os) {
     .macos => switch (native_arch) {
@@ -1863,16 +1858,14 @@ pub extern "c" fn setlogmask(maskpri: c_int) c_int;
 
 pub extern "c" fn if_nametoindex([*:0]const u8) c_int;
 
-pub usingnamespace if (builtin.target.isAndroid()) struct {
-    // android bionic libc does not implement getcontext,
-    // and std.os.linux.getcontext also cannot be built for
-    // bionic libc currently.
-} else if (native_os == .linux and builtin.target.isMusl()) struct {
-    // musl does not implement getcontext
-    pub const getcontext = std.os.linux.getcontext;
-} else struct {
-    pub extern "c" fn getcontext(ucp: *std.os.ucontext_t) c_int;
-};
+pub const getcontext = if (builtin.target.isAndroid())
+    @compileError("android bionic libc does not implement getcontext")
+else if (native_os == .linux and builtin.target.isMusl())
+    std.os.linux.getcontext
+else
+    struct {
+        extern fn getcontext(ucp: *std.os.ucontext_t) c_int;
+    }.getcontext;
 
 pub const max_align_t = if (native_abi == .msvc)
     f64

lib/std/c/openbsd.zig

@@ -894,11 +894,6 @@ comptime {
         std.debug.assert(@sizeOf(siginfo_t) == 136);
 }
 
-pub usingnamespace switch (builtin.cpu.arch) {
-    .x86_64 => struct {},
-    else => struct {},
-};
-
 pub const ucontext_t = switch (builtin.cpu.arch) {
     .x86_64 => extern struct {
         sc_rdi: c_long,