std: reorganization that allows new usingnamespace semantics

The proposal #9629 is now accepted, usingnamespace stays but no longer
puts identifiers in scope.

Author: andrewrk

CMakeLists.txt

@@ -431,7 +431,6 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/lib/std/os/linux/io_uring.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/bits.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/os/windows/ntstatus.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/os/windows/win32error.zig"
     "${CMAKE_SOURCE_DIR}/lib/std/Progress.zig"

lib/std/builtin.zig

@@ -27,7 +27,7 @@ pub const code_model = builtin.code_model;
 /// used rather than `explicit_subsystem`.
 /// On non-Windows targets, this is `null`.
 pub const subsystem: ?std.Target.SubSystem = blk: {
-    if (@hasDecl(builtin, "explicit_subsystem")) break :blk explicit_subsystem;
+    if (@hasDecl(builtin, "explicit_subsystem")) break :blk builtin.explicit_subsystem;
     switch (os.tag) {
         .windows => {
             if (is_test) {

lib/std/c.zig

@@ -4,6 +4,7 @@ const builtin = @import("builtin");
 const macho = std.macho;
 const native_arch = builtin.target.cpu.arch;
 const maxInt = std.math.maxInt;
+const iovec_const = std.os.iovec_const;
 
 extern "c" fn __error() *c_int;
 pub extern "c" fn NSVersionOfRunTimeLibrary(library_name: [*:0]const u8) u32;
@@ -84,8 +85,6 @@ pub const _errno = __error;
 pub extern "c" fn @"close$NOCANCEL"(fd: fd_t) c_int;
 pub extern "c" fn mach_host_self() mach_port_t;
 pub extern "c" fn clock_get_time(clock_serv: clock_serv_t, cur_time: *mach_timespec_t) kern_return_t;
-pub extern "c" fn host_get_clock_service(host: host_t, clock_id: clock_id_t, clock_serv: ?[*]clock_serv_t) kern_return_t;
-pub extern "c" fn mach_port_deallocate(task: ipc_space_t, name: mach_port_name_t) kern_return_t;
 
 pub const sf_hdtr = extern struct {
     headers: [*]const iovec_const,
@@ -1550,19 +1549,17 @@ pub fn S_IWHT(m: u32) bool {
 
 pub const HOST_NAME_MAX = 72;
 
-pub const AT_FDCWD = -2;
-
-/// Use effective ids in access check
-pub const AT_EACCESS = 0x0010;
-
-/// Act on the symlink itself not the target
-pub const AT_SYMLINK_NOFOLLOW = 0x0020;
-
-/// Act on target of symlink
-pub const AT_SYMLINK_FOLLOW = 0x0040;
-
-/// Path refers to directory
-pub const AT_REMOVEDIR = 0x0080;
+pub const AT = struct {
+    pub const FDCWD = -2;
+    /// Use effective ids in access check
+    pub const EACCESS = 0x0010;
+    /// Act on the symlink itself not the target
+    pub const SYMLINK_NOFOLLOW = 0x0020;
+    /// Act on target of symlink
+    pub const SYMLINK_FOLLOW = 0x0040;
+    /// Path refers to directory
+    pub const REMOVEDIR = 0x0080;
+};
 
 pub const addrinfo = extern struct {
     flags: i32,
@@ -1590,164 +1587,117 @@ pub const RTLD = struct {
     pub const MAIN_ONLY = @intToPtr(*c_void, @bitCast(usize, @as(isize, -5)));
 };
 
-/// duplicate file descriptor
-pub const F_DUPFD = 0;
-
-/// get file descriptor flags
-pub const F_GETFD = 1;
-
-/// set file descriptor flags
-pub const F_SETFD = 2;
-
-/// get file status flags
-pub const F_GETFL = 3;
-
-/// set file status flags
-pub const F_SETFL = 4;
-
-/// get SIGIO/SIGURG proc/pgrp
-pub const F_GETOWN = 5;
-
-/// set SIGIO/SIGURG proc/pgrp
-pub const F_SETOWN = 6;
-
-/// get record locking information
-pub const F_GETLK = 7;
-
-/// set record locking information
-pub const F_SETLK = 8;
-
-/// F_SETLK; wait if blocked
-pub const F_SETLKW = 9;
-
-/// F_SETLK; wait if blocked, return on timeout
-pub const F_SETLKWTIMEOUT = 10;
-pub const F_FLUSH_DATA = 40;
-
-/// Used for regression test
-pub const F_CHKCLEAN = 41;
-
-/// Preallocate storage
-pub const F_PREALLOCATE = 42;
-
-/// Truncate a file without zeroing space
-pub const F_SETSIZE = 43;
-
-/// Issue an advisory read async with no copy to user
-pub const F_RDADVISE = 44;
-
-/// turn read ahead off/on for this fd
-pub const F_RDAHEAD = 45;
-
-/// turn data caching off/on for this fd
-pub const F_NOCACHE = 48;
-
-/// file offset to device offset
-pub const F_LOG2PHYS = 49;
-
-/// return the full path of the fd
-pub const F_GETPATH = 50;
-
-/// fsync + ask the drive to flush to the media
-pub const F_FULLFSYNC = 51;
-
-/// find which component (if any) is a package
-pub const F_PATHPKG_CHECK = 52;
-
-/// "freeze" all fs operations
-pub const F_FREEZE_FS = 53;
-
-/// "thaw" all fs operations
-pub const F_THAW_FS = 54;
-
-/// turn data caching off/on (globally) for this file
-pub const F_GLOBAL_NOCACHE = 55;
-
-/// add detached signatures
-pub const F_ADDSIGS = 59;
-
-/// add signature from same file (used by dyld for shared libs)
-pub const F_ADDFILESIGS = 61;
-
-/// used in conjunction with F_NOCACHE to indicate that DIRECT, synchonous writes
-/// should not be used (i.e. its ok to temporaily create cached pages)
-pub const F_NODIRECT = 62;
-
-///Get the protection class of a file from the EA, returns int
-pub const F_GETPROTECTIONCLASS = 63;
-
-///Set the protection class of a file for the EA, requires int
-pub const F_SETPROTECTIONCLASS = 64;
-
-///file offset to device offset, extended
-pub const F_LOG2PHYS_EXT = 65;
-
-///get record locking information, per-process
-pub const F_GETLKPID = 66;
-
-///Mark the file as being the backing store for another filesystem
-pub const F_SETBACKINGSTORE = 70;
-
-///return the full path of the FD, but error in specific mtmd circumstances
-pub const F_GETPATH_MTMINFO = 71;
-
-///Returns the code directory, with associated hashes, to the caller
-pub const F_GETCODEDIR = 72;
-
-///No SIGPIPE generated on EPIPE
-pub const F_SETNOSIGPIPE = 73;
-
-///Status of SIGPIPE for this fd
-pub const F_GETNOSIGPIPE = 74;
-
-///For some cases, we need to rewrap the key for AKS/MKB
-pub const F_TRANSCODEKEY = 75;
-
-///file being written to a by single writer... if throttling enabled, writes
-///may be broken into smaller chunks with throttling in between
-pub const F_SINGLE_WRITER = 76;
-
-///Get the protection version number for this filesystem
-pub const F_GETPROTECTIONLEVEL = 77;
-
-///Add detached code signatures (used by dyld for shared libs)
-pub const F_FINDSIGS = 78;
-
-///Add signature from same file, only if it is signed by Apple (used by dyld for simulator)
-pub const F_ADDFILESIGS_FOR_DYLD_SIM = 83;
-
-///fsync + issue barrier to drive
-pub const F_BARRIERFSYNC = 85;
-
-///Add signature from same file, return end offset in structure on success
-pub const F_ADDFILESIGS_RETURN = 97;
-
-///Check if Library Validation allows this Mach-O file to be mapped into the calling process
-pub const F_CHECK_LV = 98;
-
-///Deallocate a range of the file
-pub const F_PUNCHHOLE = 99;
-
-///Trim an active file
-pub const F_TRIM_ACTIVE_FILE = 100;
+pub const F = struct {
+    /// duplicate file descriptor
+    pub const DUPFD = 0;
+    /// get file descriptor flags
+    pub const GETFD = 1;
+    /// set file descriptor flags
+    pub const SETFD = 2;
+    /// get file status flags
+    pub const GETFL = 3;
+    /// set file status flags
+    pub const SETFL = 4;
+    /// get SIGIO/SIGURG proc/pgrp
+    pub const GETOWN = 5;
+    /// set SIGIO/SIGURG proc/pgrp
+    pub const SETOWN = 6;
+    /// get record locking information
+    pub const GETLK = 7;
+    /// set record locking information
+    pub const SETLK = 8;
+    /// F.SETLK; wait if blocked
+    pub const SETLKW = 9;
+    /// F.SETLK; wait if blocked, return on timeout
+    pub const SETLKWTIMEOUT = 10;
+    pub const FLUSH_DATA = 40;
+    /// Used for regression test
+    pub const CHKCLEAN = 41;
+    /// Preallocate storage
+    pub const PREALLOCATE = 42;
+    /// Truncate a file without zeroing space
+    pub const SETSIZE = 43;
+    /// Issue an advisory read async with no copy to user
+    pub const RDADVISE = 44;
+    /// turn read ahead off/on for this fd
+    pub const RDAHEAD = 45;
+    /// turn data caching off/on for this fd
+    pub const NOCACHE = 48;
+    /// file offset to device offset
+    pub const LOG2PHYS = 49;
+    /// return the full path of the fd
+    pub const GETPATH = 50;
+    /// fsync + ask the drive to flush to the media
+    pub const FULLFSYNC = 51;
+    /// find which component (if any) is a package
+    pub const PATHPKG_CHECK = 52;
+    /// "freeze" all fs operations
+    pub const FREEZE_FS = 53;
+    /// "thaw" all fs operations
+    pub const THAW_FS = 54;
+    /// turn data caching off/on (globally) for this file
+    pub const GLOBAL_NOCACHE = 55;
+    /// add detached signatures
+    pub const ADDSIGS = 59;
+    /// add signature from same file (used by dyld for shared libs)
+    pub const ADDFILESIGS = 61;
+    /// used in conjunction with F.NOCACHE to indicate that DIRECT, synchonous writes
+    /// should not be used (i.e. its ok to temporaily create cached pages)
+    pub const NODIRECT = 62;
+    ///Get the protection class of a file from the EA, returns int
+    pub const GETPROTECTIONCLASS = 63;
+    ///Set the protection class of a file for the EA, requires int
+    pub const SETPROTECTIONCLASS = 64;
+    ///file offset to device offset, extended
+    pub const LOG2PHYS_EXT = 65;
+    ///get record locking information, per-process
+    pub const GETLKPID = 66;
+    ///Mark the file as being the backing store for another filesystem
+    pub const SETBACKINGSTORE = 70;
+    ///return the full path of the FD, but error in specific mtmd circumstances
+    pub const GETPATH_MTMINFO = 71;
+    ///Returns the code directory, with associated hashes, to the caller
+    pub const GETCODEDIR = 72;
+    ///No SIGPIPE generated on EPIPE
+    pub const SETNOSIGPIPE = 73;
+    ///Status of SIGPIPE for this fd
+    pub const GETNOSIGPIPE = 74;
+    ///For some cases, we need to rewrap the key for AKS/MKB
+    pub const TRANSCODEKEY = 75;
+    ///file being written to a by single writer... if throttling enabled, writes
+    ///may be broken into smaller chunks with throttling in between
+    pub const SINGLE_WRITER = 76;
+    ///Get the protection version number for this filesystem
+    pub const GETPROTECTIONLEVEL = 77;
+    ///Add detached code signatures (used by dyld for shared libs)
+    pub const FINDSIGS = 78;
+    ///Add signature from same file, only if it is signed by Apple (used by dyld for simulator)
+    pub const ADDFILESIGS_FOR_DYLD_SIM = 83;
+    ///fsync + issue barrier to drive
+    pub const BARRIERFSYNC = 85;
+    ///Add signature from same file, return end offset in structure on success
+    pub const ADDFILESIGS_RETURN = 97;
+    ///Check if Library Validation allows this Mach-O file to be mapped into the calling process
+    pub const CHECK_LV = 98;
+    ///Deallocate a range of the file
+    pub const PUNCHHOLE = 99;
+    ///Trim an active file
+    pub const TRIM_ACTIVE_FILE = 100;
+    ///mark the dup with FD_CLOEXEC
+    pub const DUPFD_CLOEXEC = 67;
+    /// shared or read lock
+    pub const RDLCK = 1;
+    /// unlock
+    pub const UNLCK = 2;
+    /// exclusive or write lock
+    pub const WRLCK = 3;
+};
 
 pub const FCNTL_FS_SPECIFIC_BASE = 0x00010000;
 
-///mark the dup with FD_CLOEXEC
-pub const F_DUPFD_CLOEXEC = 67;
-
 ///close-on-exec flag
 pub const FD_CLOEXEC = 1;
 
-/// shared or read lock
-pub const F_RDLCK = 1;
-
-/// unlock
-pub const F_UNLCK = 2;
-
-/// exclusive or write lock
-pub const F_WRLCK = 3;
-
 pub const LOCK = struct {
     pub const SH = 1;
     pub const EX = 2;