Rename `libc/utils/hdrgen/yaml/` to `libc/utils/hdrgen/spec/` #120931

vinay-deshmukh · 2024-12-23T04:35:11Z

Resolves #120736

Naming an "application" directory the same name as a python module causes conflicts when import-ing the module. This patch renames the directory to spec/ per: [libc] ninja check-libc: AttributeError: module 'yaml' has no attribute 'safe_load' #120736 (comment)
Note: I saw a minor typo in libc/CMakeLists.txt as well. Added that to this PR, let me know if that's ok or if it's better to have a separate PR for it.
Update docs with the new directory name per comment

To avoid python module lookup conflict

llvmbot · 2024-12-23T04:48:30Z

@llvm/pr-subscribers-libc

Author: Vinay Deshmukh (vinay-deshmukh)

Changes

Resolves #120736

Naming an "application" directory the same name as a python module causes conflicts when import-ing the module. This patch renames the directory to spec/ per: [libc] ninja check-libc: AttributeError: module 'yaml' has no attribute 'safe_load' #120736 (comment)
Note: I saw a minor typo in libc/CMakeLists.txt as well. Added that to this PR, let me know if that's ok or if it's better to have a separate PR for it.

Patch is 20.20 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/120931.diff

57 Files Affected:

(modified) libc/CMakeLists.txt (+1-1)
(renamed) libc/hdrgen/spec/arpa/inet.yaml ()
(renamed) libc/hdrgen/spec/assert.yaml ()
(renamed) libc/hdrgen/spec/complex.yaml ()
(renamed) libc/hdrgen/spec/ctype.yaml ()
(renamed) libc/hdrgen/spec/dirent.yaml ()
(renamed) libc/hdrgen/spec/dlfcn.yaml ()
(renamed) libc/hdrgen/spec/elf.yaml ()
(renamed) libc/hdrgen/spec/errno.yaml ()
(renamed) libc/hdrgen/spec/fcntl.yaml ()
(renamed) libc/hdrgen/spec/features.yaml ()
(renamed) libc/hdrgen/spec/fenv.yaml ()
(renamed) libc/hdrgen/spec/float.yaml ()
(renamed) libc/hdrgen/spec/inttypes.yaml ()
(renamed) libc/hdrgen/spec/limits.yaml ()
(renamed) libc/hdrgen/spec/link.yaml ()
(renamed) libc/hdrgen/spec/locale.yaml ()
(renamed) libc/hdrgen/spec/malloc.yaml ()
(renamed) libc/hdrgen/spec/math.yaml ()
(renamed) libc/hdrgen/spec/pthread.yaml ()
(renamed) libc/hdrgen/spec/sched.yaml ()
(renamed) libc/hdrgen/spec/search.yaml ()
(renamed) libc/hdrgen/spec/setjmp.yaml ()
(renamed) libc/hdrgen/spec/signal.yaml ()
(renamed) libc/hdrgen/spec/spawn.yaml ()
(renamed) libc/hdrgen/spec/stdbit.yaml ()
(renamed) libc/hdrgen/spec/stdckdint.yaml ()
(renamed) libc/hdrgen/spec/stdfix.yaml ()
(renamed) libc/hdrgen/spec/stdint.yaml ()
(renamed) libc/hdrgen/spec/stdio.yaml ()
(renamed) libc/hdrgen/spec/stdlib.yaml ()
(renamed) libc/hdrgen/spec/string.yaml ()
(renamed) libc/hdrgen/spec/strings.yaml ()
(renamed) libc/hdrgen/spec/sys/auxv.yaml ()
(renamed) libc/hdrgen/spec/sys/epoll.yaml ()
(renamed) libc/hdrgen/spec/sys/ioctl.yaml ()
(renamed) libc/hdrgen/spec/sys/mman.yaml ()
(renamed) libc/hdrgen/spec/sys/prctl.yaml ()
(renamed) libc/hdrgen/spec/sys/random.yaml ()
(renamed) libc/hdrgen/spec/sys/resource.yaml ()
(renamed) libc/hdrgen/spec/sys/select.yaml ()
(renamed) libc/hdrgen/spec/sys/sendfile.yaml ()
(renamed) libc/hdrgen/spec/sys/socket.yaml ()
(renamed) libc/hdrgen/spec/sys/stat.yaml ()
(renamed) libc/hdrgen/spec/sys/statvfs.yaml ()
(renamed) libc/hdrgen/spec/sys/syscall.yaml ()
(renamed) libc/hdrgen/spec/sys/time.yaml ()
(renamed) libc/hdrgen/spec/sys/types.yaml ()
(renamed) libc/hdrgen/spec/sys/utsname.yaml ()
(renamed) libc/hdrgen/spec/sys/wait.yaml ()
(renamed) libc/hdrgen/spec/termios.yaml ()
(renamed) libc/hdrgen/spec/threads.yaml ()
(renamed) libc/hdrgen/spec/time.yaml ()
(renamed) libc/hdrgen/spec/uchar.yaml ()
(renamed) libc/hdrgen/spec/unistd.yaml ()
(renamed) libc/hdrgen/spec/wchar.yaml ()
(modified) libc/include/CMakeLists.txt (+55-55)

diff --git a/libc/CMakeLists.txt b/libc/CMakeLists.txt
index 00a07ea3c8ac75..b274273d0d5915 100644
--- a/libc/CMakeLists.txt
+++ b/libc/CMakeLists.txt
@@ -272,7 +272,7 @@ endif()
 if(LLVM_LIBC_ENABLE_LINTING)
   if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     set(LLVM_LIBC_ENABLE_LINTING OFF)
-    message(WARNING "C++ compiler is not clang++, linting with be disabled.")
+    message(WARNING "C++ compiler is not clang++, linting will be disabled.")
   else()
     if (NOT LLVM_LIBC_CLANG_TIDY)
       find_program(LLVM_LIBC_CLANG_TIDY NAMES clang-tidy)
diff --git a/libc/hdrgen/yaml/arpa/inet.yaml b/libc/hdrgen/spec/arpa/inet.yaml
similarity index 100%
rename from libc/hdrgen/yaml/arpa/inet.yaml
rename to libc/hdrgen/spec/arpa/inet.yaml
diff --git a/libc/hdrgen/yaml/assert.yaml b/libc/hdrgen/spec/assert.yaml
similarity index 100%
rename from libc/hdrgen/yaml/assert.yaml
rename to libc/hdrgen/spec/assert.yaml
diff --git a/libc/hdrgen/yaml/complex.yaml b/libc/hdrgen/spec/complex.yaml
similarity index 100%
rename from libc/hdrgen/yaml/complex.yaml
rename to libc/hdrgen/spec/complex.yaml
diff --git a/libc/hdrgen/yaml/ctype.yaml b/libc/hdrgen/spec/ctype.yaml
similarity index 100%
rename from libc/hdrgen/yaml/ctype.yaml
rename to libc/hdrgen/spec/ctype.yaml
diff --git a/libc/hdrgen/yaml/dirent.yaml b/libc/hdrgen/spec/dirent.yaml
similarity index 100%
rename from libc/hdrgen/yaml/dirent.yaml
rename to libc/hdrgen/spec/dirent.yaml
diff --git a/libc/hdrgen/yaml/dlfcn.yaml b/libc/hdrgen/spec/dlfcn.yaml
similarity index 100%
rename from libc/hdrgen/yaml/dlfcn.yaml
rename to libc/hdrgen/spec/dlfcn.yaml
diff --git a/libc/hdrgen/yaml/elf.yaml b/libc/hdrgen/spec/elf.yaml
similarity index 100%
rename from libc/hdrgen/yaml/elf.yaml
rename to libc/hdrgen/spec/elf.yaml
diff --git a/libc/hdrgen/yaml/errno.yaml b/libc/hdrgen/spec/errno.yaml
similarity index 100%
rename from libc/hdrgen/yaml/errno.yaml
rename to libc/hdrgen/spec/errno.yaml
diff --git a/libc/hdrgen/yaml/fcntl.yaml b/libc/hdrgen/spec/fcntl.yaml
similarity index 100%
rename from libc/hdrgen/yaml/fcntl.yaml
rename to libc/hdrgen/spec/fcntl.yaml
diff --git a/libc/hdrgen/yaml/features.yaml b/libc/hdrgen/spec/features.yaml
similarity index 100%
rename from libc/hdrgen/yaml/features.yaml
rename to libc/hdrgen/spec/features.yaml
diff --git a/libc/hdrgen/yaml/fenv.yaml b/libc/hdrgen/spec/fenv.yaml
similarity index 100%
rename from libc/hdrgen/yaml/fenv.yaml
rename to libc/hdrgen/spec/fenv.yaml
diff --git a/libc/hdrgen/yaml/float.yaml b/libc/hdrgen/spec/float.yaml
similarity index 100%
rename from libc/hdrgen/yaml/float.yaml
rename to libc/hdrgen/spec/float.yaml
diff --git a/libc/hdrgen/yaml/inttypes.yaml b/libc/hdrgen/spec/inttypes.yaml
similarity index 100%
rename from libc/hdrgen/yaml/inttypes.yaml
rename to libc/hdrgen/spec/inttypes.yaml
diff --git a/libc/hdrgen/yaml/limits.yaml b/libc/hdrgen/spec/limits.yaml
similarity index 100%
rename from libc/hdrgen/yaml/limits.yaml
rename to libc/hdrgen/spec/limits.yaml
diff --git a/libc/hdrgen/yaml/link.yaml b/libc/hdrgen/spec/link.yaml
similarity index 100%
rename from libc/hdrgen/yaml/link.yaml
rename to libc/hdrgen/spec/link.yaml
diff --git a/libc/hdrgen/yaml/locale.yaml b/libc/hdrgen/spec/locale.yaml
similarity index 100%
rename from libc/hdrgen/yaml/locale.yaml
rename to libc/hdrgen/spec/locale.yaml
diff --git a/libc/hdrgen/yaml/malloc.yaml b/libc/hdrgen/spec/malloc.yaml
similarity index 100%
rename from libc/hdrgen/yaml/malloc.yaml
rename to libc/hdrgen/spec/malloc.yaml
diff --git a/libc/hdrgen/yaml/math.yaml b/libc/hdrgen/spec/math.yaml
similarity index 100%
rename from libc/hdrgen/yaml/math.yaml
rename to libc/hdrgen/spec/math.yaml
diff --git a/libc/hdrgen/yaml/pthread.yaml b/libc/hdrgen/spec/pthread.yaml
similarity index 100%
rename from libc/hdrgen/yaml/pthread.yaml
rename to libc/hdrgen/spec/pthread.yaml
diff --git a/libc/hdrgen/yaml/sched.yaml b/libc/hdrgen/spec/sched.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sched.yaml
rename to libc/hdrgen/spec/sched.yaml
diff --git a/libc/hdrgen/yaml/search.yaml b/libc/hdrgen/spec/search.yaml
similarity index 100%
rename from libc/hdrgen/yaml/search.yaml
rename to libc/hdrgen/spec/search.yaml
diff --git a/libc/hdrgen/yaml/setjmp.yaml b/libc/hdrgen/spec/setjmp.yaml
similarity index 100%
rename from libc/hdrgen/yaml/setjmp.yaml
rename to libc/hdrgen/spec/setjmp.yaml
diff --git a/libc/hdrgen/yaml/signal.yaml b/libc/hdrgen/spec/signal.yaml
similarity index 100%
rename from libc/hdrgen/yaml/signal.yaml
rename to libc/hdrgen/spec/signal.yaml
diff --git a/libc/hdrgen/yaml/spawn.yaml b/libc/hdrgen/spec/spawn.yaml
similarity index 100%
rename from libc/hdrgen/yaml/spawn.yaml
rename to libc/hdrgen/spec/spawn.yaml
diff --git a/libc/hdrgen/yaml/stdbit.yaml b/libc/hdrgen/spec/stdbit.yaml
similarity index 100%
rename from libc/hdrgen/yaml/stdbit.yaml
rename to libc/hdrgen/spec/stdbit.yaml
diff --git a/libc/hdrgen/yaml/stdckdint.yaml b/libc/hdrgen/spec/stdckdint.yaml
similarity index 100%
rename from libc/hdrgen/yaml/stdckdint.yaml
rename to libc/hdrgen/spec/stdckdint.yaml
diff --git a/libc/hdrgen/yaml/stdfix.yaml b/libc/hdrgen/spec/stdfix.yaml
similarity index 100%
rename from libc/hdrgen/yaml/stdfix.yaml
rename to libc/hdrgen/spec/stdfix.yaml
diff --git a/libc/hdrgen/yaml/stdint.yaml b/libc/hdrgen/spec/stdint.yaml
similarity index 100%
rename from libc/hdrgen/yaml/stdint.yaml
rename to libc/hdrgen/spec/stdint.yaml
diff --git a/libc/hdrgen/yaml/stdio.yaml b/libc/hdrgen/spec/stdio.yaml
similarity index 100%
rename from libc/hdrgen/yaml/stdio.yaml
rename to libc/hdrgen/spec/stdio.yaml
diff --git a/libc/hdrgen/yaml/stdlib.yaml b/libc/hdrgen/spec/stdlib.yaml
similarity index 100%
rename from libc/hdrgen/yaml/stdlib.yaml
rename to libc/hdrgen/spec/stdlib.yaml
diff --git a/libc/hdrgen/yaml/string.yaml b/libc/hdrgen/spec/string.yaml
similarity index 100%
rename from libc/hdrgen/yaml/string.yaml
rename to libc/hdrgen/spec/string.yaml
diff --git a/libc/hdrgen/yaml/strings.yaml b/libc/hdrgen/spec/strings.yaml
similarity index 100%
rename from libc/hdrgen/yaml/strings.yaml
rename to libc/hdrgen/spec/strings.yaml
diff --git a/libc/hdrgen/yaml/sys/auxv.yaml b/libc/hdrgen/spec/sys/auxv.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/auxv.yaml
rename to libc/hdrgen/spec/sys/auxv.yaml
diff --git a/libc/hdrgen/yaml/sys/epoll.yaml b/libc/hdrgen/spec/sys/epoll.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/epoll.yaml
rename to libc/hdrgen/spec/sys/epoll.yaml
diff --git a/libc/hdrgen/yaml/sys/ioctl.yaml b/libc/hdrgen/spec/sys/ioctl.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/ioctl.yaml
rename to libc/hdrgen/spec/sys/ioctl.yaml
diff --git a/libc/hdrgen/yaml/sys/mman.yaml b/libc/hdrgen/spec/sys/mman.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/mman.yaml
rename to libc/hdrgen/spec/sys/mman.yaml
diff --git a/libc/hdrgen/yaml/sys/prctl.yaml b/libc/hdrgen/spec/sys/prctl.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/prctl.yaml
rename to libc/hdrgen/spec/sys/prctl.yaml
diff --git a/libc/hdrgen/yaml/sys/random.yaml b/libc/hdrgen/spec/sys/random.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/random.yaml
rename to libc/hdrgen/spec/sys/random.yaml
diff --git a/libc/hdrgen/yaml/sys/resource.yaml b/libc/hdrgen/spec/sys/resource.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/resource.yaml
rename to libc/hdrgen/spec/sys/resource.yaml
diff --git a/libc/hdrgen/yaml/sys/select.yaml b/libc/hdrgen/spec/sys/select.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/select.yaml
rename to libc/hdrgen/spec/sys/select.yaml
diff --git a/libc/hdrgen/yaml/sys/sendfile.yaml b/libc/hdrgen/spec/sys/sendfile.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/sendfile.yaml
rename to libc/hdrgen/spec/sys/sendfile.yaml
diff --git a/libc/hdrgen/yaml/sys/socket.yaml b/libc/hdrgen/spec/sys/socket.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/socket.yaml
rename to libc/hdrgen/spec/sys/socket.yaml
diff --git a/libc/hdrgen/yaml/sys/stat.yaml b/libc/hdrgen/spec/sys/stat.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/stat.yaml
rename to libc/hdrgen/spec/sys/stat.yaml
diff --git a/libc/hdrgen/yaml/sys/statvfs.yaml b/libc/hdrgen/spec/sys/statvfs.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/statvfs.yaml
rename to libc/hdrgen/spec/sys/statvfs.yaml
diff --git a/libc/hdrgen/yaml/sys/syscall.yaml b/libc/hdrgen/spec/sys/syscall.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/syscall.yaml
rename to libc/hdrgen/spec/sys/syscall.yaml
diff --git a/libc/hdrgen/yaml/sys/time.yaml b/libc/hdrgen/spec/sys/time.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/time.yaml
rename to libc/hdrgen/spec/sys/time.yaml
diff --git a/libc/hdrgen/yaml/sys/types.yaml b/libc/hdrgen/spec/sys/types.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/types.yaml
rename to libc/hdrgen/spec/sys/types.yaml
diff --git a/libc/hdrgen/yaml/sys/utsname.yaml b/libc/hdrgen/spec/sys/utsname.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/utsname.yaml
rename to libc/hdrgen/spec/sys/utsname.yaml
diff --git a/libc/hdrgen/yaml/sys/wait.yaml b/libc/hdrgen/spec/sys/wait.yaml
similarity index 100%
rename from libc/hdrgen/yaml/sys/wait.yaml
rename to libc/hdrgen/spec/sys/wait.yaml
diff --git a/libc/hdrgen/yaml/termios.yaml b/libc/hdrgen/spec/termios.yaml
similarity index 100%
rename from libc/hdrgen/yaml/termios.yaml
rename to libc/hdrgen/spec/termios.yaml
diff --git a/libc/hdrgen/yaml/threads.yaml b/libc/hdrgen/spec/threads.yaml
similarity index 100%
rename from libc/hdrgen/yaml/threads.yaml
rename to libc/hdrgen/spec/threads.yaml
diff --git a/libc/hdrgen/yaml/time.yaml b/libc/hdrgen/spec/time.yaml
similarity index 100%
rename from libc/hdrgen/yaml/time.yaml
rename to libc/hdrgen/spec/time.yaml
diff --git a/libc/hdrgen/yaml/uchar.yaml b/libc/hdrgen/spec/uchar.yaml
similarity index 100%
rename from libc/hdrgen/yaml/uchar.yaml
rename to libc/hdrgen/spec/uchar.yaml
diff --git a/libc/hdrgen/yaml/unistd.yaml b/libc/hdrgen/spec/unistd.yaml
similarity index 100%
rename from libc/hdrgen/yaml/unistd.yaml
rename to libc/hdrgen/spec/unistd.yaml
diff --git a/libc/hdrgen/yaml/wchar.yaml b/libc/hdrgen/spec/wchar.yaml
similarity index 100%
rename from libc/hdrgen/yaml/wchar.yaml
rename to libc/hdrgen/spec/wchar.yaml
diff --git a/libc/include/CMakeLists.txt b/libc/include/CMakeLists.txt
index 3a05c01abba5a4..1e8e0f4287e227 100644
--- a/libc/include/CMakeLists.txt
+++ b/libc/include/CMakeLists.txt
@@ -32,7 +32,7 @@ endmacro()
 
 add_header_macro(
   ctype
-  ../libc/hdrgen/yaml/ctype.yaml
+  ../libc/hdrgen/spec/ctype.yaml
   ctype.h.def
   ctype.h
   DEPENDS
@@ -42,7 +42,7 @@ add_header_macro(
 
 add_header_macro(
   dirent
-  ../libc/hdrgen/yaml/dirent.yaml
+  ../libc/hdrgen/spec/dirent.yaml
   dirent.h.def
   dirent.h
   DEPENDS
@@ -54,7 +54,7 @@ add_header_macro(
 
 add_header_macro(
   fcntl
-  ../libc/hdrgen/yaml/fcntl.yaml
+  ../libc/hdrgen/spec/fcntl.yaml
   fcntl.h.def
   fcntl.h
   DEPENDS
@@ -70,7 +70,7 @@ add_header_macro(
 
 add_header_macro(
   dlfcn
-  ../libc/hdrgen/yaml/dlfcn.yaml
+  ../libc/hdrgen/spec/dlfcn.yaml
   dlfcn.h.def
   dlfcn.h
   DEPENDS
@@ -80,7 +80,7 @@ add_header_macro(
 
 add_header_macro(
   features
-  ../libc/hdrgen/yaml/features.yaml
+  ../libc/hdrgen/spec/features.yaml
   features.h.def
   features.h
   DEPENDS
@@ -90,7 +90,7 @@ add_header_macro(
 
 add_header_macro(
   fenv
-  ../libc/hdrgen/yaml/fenv.yaml
+  ../libc/hdrgen/spec/fenv.yaml
   fenv.h.def
   fenv.h
   DEPENDS
@@ -102,7 +102,7 @@ add_header_macro(
 
 add_header_macro(
   inttypes
-  ../libc/hdrgen/yaml/inttypes.yaml
+  ../libc/hdrgen/spec/inttypes.yaml
   inttypes.h.def
   inttypes.h
   DEPENDS
@@ -113,7 +113,7 @@ add_header_macro(
 
 add_header_macro(
   float
-  ../libc/hdrgen/yaml/float.yaml
+  ../libc/hdrgen/spec/float.yaml
   float.h.def
   float.h
   DEPENDS
@@ -122,7 +122,7 @@ add_header_macro(
 
 add_header_macro(
   stdint
-  ../libc/hdrgen/yaml/stdint.yaml
+  ../libc/hdrgen/spec/stdint.yaml
   stdint.h.def
   stdint.h
   DEPENDS
@@ -131,7 +131,7 @@ add_header_macro(
 
 add_header_macro(
   limits
-  ../libc/hdrgen/yaml/limits.yaml
+  ../libc/hdrgen/spec/limits.yaml
   limits.h.def
   limits.h
   DEPENDS
@@ -140,7 +140,7 @@ add_header_macro(
 
 add_header_macro(
   malloc
-  ../libc/hdrgen/yaml/malloc.yaml
+  ../libc/hdrgen/spec/malloc.yaml
   malloc.h.def
   malloc.h
   DEPENDS
@@ -150,7 +150,7 @@ add_header_macro(
 
 add_header_macro(
   math
-  ../libc/hdrgen/yaml/math.yaml
+  ../libc/hdrgen/spec/math.yaml
   math.h.def
   math.h
   DEPENDS
@@ -165,7 +165,7 @@ add_header_macro(
 
 add_header_macro(
   stdfix
-  ../libc/hdrgen/yaml/stdfix.yaml
+  ../libc/hdrgen/spec/stdfix.yaml
   stdfix.h.def
   stdfix.h
   DEPENDS
@@ -178,7 +178,7 @@ file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/arpa)
 
 add_header_macro(
   arpa_inet
-  ../libc/hdrgen/yaml/arpa/inet.yaml
+  ../libc/hdrgen/spec/arpa/inet.yaml
   arpa/inet.h.def
   arpa/inet.h
   DEPENDS
@@ -187,7 +187,7 @@ add_header_macro(
 
 add_header_macro(
   assert
-  ../libc/hdrgen/yaml/assert.yaml
+  ../libc/hdrgen/spec/assert.yaml
   assert.h.def
   assert.h
   DEPENDS
@@ -197,7 +197,7 @@ add_header_macro(
 
 add_header_macro(
   complex
-  ../libc/hdrgen/yaml/complex.yaml
+  ../libc/hdrgen/spec/complex.yaml
   complex.h.def
   complex.h
   DEPENDS
@@ -207,7 +207,7 @@ add_header_macro(
 
 add_header_macro(
   setjmp
-  ../libc/hdrgen/yaml/setjmp.yaml
+  ../libc/hdrgen/spec/setjmp.yaml
   setjmp.h.def
   setjmp.h
   DEPENDS
@@ -217,7 +217,7 @@ add_header_macro(
 
 add_header_macro(
   string
-  ../libc/hdrgen/yaml/string.yaml
+  ../libc/hdrgen/spec/string.yaml
   string.h.def
   string.h
   DEPENDS
@@ -228,7 +228,7 @@ add_header_macro(
 
 add_header_macro(
   strings
-  ../libc/hdrgen/yaml/strings.yaml
+  ../libc/hdrgen/spec/strings.yaml
   strings.h.def
   strings.h
   DEPENDS
@@ -238,7 +238,7 @@ add_header_macro(
 
 add_header_macro(
   search
-  ../libc/hdrgen/yaml/search.yaml
+  ../libc/hdrgen/spec/search.yaml
   search.h.def
   search.h
   DEPENDS
@@ -252,7 +252,7 @@ add_header_macro(
 
 add_header_macro(
   time
-  ../libc/hdrgen/yaml/time.yaml
+  ../libc/hdrgen/spec/time.yaml
   time.h.def
   time.h
   DEPENDS
@@ -268,7 +268,7 @@ add_header_macro(
 
 add_header_macro(
   threads
-  ../libc/hdrgen/yaml/threads.yaml
+  ../libc/hdrgen/spec/threads.yaml
   threads.h.def
   threads.h
   DEPENDS
@@ -285,7 +285,7 @@ add_header_macro(
 
 add_header_macro(
   errno
-  ../libc/hdrgen/yaml/errno.yaml
+  ../libc/hdrgen/spec/errno.yaml
   errno.h.def
   errno.h
   DEPENDS
@@ -295,7 +295,7 @@ add_header_macro(
 
 add_header_macro(
   signal
-  ../libc/hdrgen/yaml/signal.yaml
+  ../libc/hdrgen/spec/signal.yaml
   signal.h.def
   signal.h
   DEPENDS
@@ -311,7 +311,7 @@ add_header_macro(
 
 add_header_macro(
   stdbit
-  ../libc/hdrgen/yaml/stdbit.yaml
+  ../libc/hdrgen/spec/stdbit.yaml
   stdbit.h.def
   stdbit.h
   DEPENDS
@@ -321,7 +321,7 @@ add_header_macro(
 
 add_header_macro(
   stdckdint
-  ../libc/hdrgen/yaml/stdckdint.yaml
+  ../libc/hdrgen/spec/stdckdint.yaml
   stdckdint.h.def
   stdckdint.h
   DEPENDS
@@ -331,7 +331,7 @@ add_header_macro(
 
 add_header_macro(
   stdio
-  ../libc/hdrgen/yaml/stdio.yaml
+  ../libc/hdrgen/spec/stdio.yaml
   stdio.h.def
   stdio.h
   DEPENDS
@@ -347,7 +347,7 @@ add_header_macro(
 
 add_header_macro(
   stdlib
-  ../libc/hdrgen/yaml/stdlib.yaml
+  ../libc/hdrgen/spec/stdlib.yaml
   stdlib.h.def
   stdlib.h
   DEPENDS
@@ -366,7 +366,7 @@ add_header_macro(
 
 add_header_macro(
   unistd
-  ../libc/hdrgen/yaml/unistd.yaml
+  ../libc/hdrgen/spec/unistd.yaml
   unistd.h.def
   unistd.h
   DEPENDS
@@ -385,7 +385,7 @@ add_header_macro(
 
 add_header_macro(
   pthread
-  ../libc/hdrgen/yaml/pthread.yaml
+  ../libc/hdrgen/spec/pthread.yaml
   pthread.h.def
   pthread.h
   DEPENDS
@@ -409,7 +409,7 @@ add_header_macro(
 
 add_header_macro(
   sched
-  ../libc/hdrgen/yaml/sched.yaml
+  ../libc/hdrgen/spec/sched.yaml
   sched.h.def
   sched.h
   DEPENDS
@@ -426,7 +426,7 @@ add_header_macro(
 
 add_header_macro(
   spawn
-  ../libc/hdrgen/yaml/spawn.yaml
+  ../libc/hdrgen/spec/spawn.yaml
   spawn.h.def
   spawn.h
   DEPENDS
@@ -439,7 +439,7 @@ add_header_macro(
 
 add_header_macro(
   link
-  ../libc/hdrgen/yaml/link.yaml
+  ../libc/hdrgen/spec/link.yaml
   link.h.def
   link.h
   DEPENDS
@@ -449,7 +449,7 @@ add_header_macro(
 
 add_header_macro(
   elf
-  ../libc/hdrgen/yaml/elf.yaml
+  ../libc/hdrgen/spec/elf.yaml
   elf.h.def
   elf.h
   DEPENDS
@@ -463,7 +463,7 @@ file(MAKE_DIRECTORY ${LIBC_INCLUDE_DIR}/sys)
 
 add_header_macro(
   sys_auxv
-  ../libc/hdrgen/yaml/sys/auxv.yaml
+  ../libc/hdrgen/spec/sys/auxv.yaml
   sys/auxv.h.def
   sys/auxv.h
   DEPENDS
@@ -473,7 +473,7 @@ add_header_macro(
 
 add_header_macro(
   sys_epoll
-  ../libc/hdrgen/yaml/sys/epoll.yaml
+  ../libc/hdrgen/spec/sys/epoll.yaml
   sys/epoll.h.def
   sys/epoll.h
   DEPENDS
@@ -486,7 +486,7 @@ add_header_macro(
 
 add_header_macro(
   sys_ioctl
-  ../libc/hdrgen/yaml/sys/ioctl.yaml
+  ../libc/hdrgen/spec/sys/ioctl.yaml
   sys/ioctl.h.def
   sys/ioctl.h
   DEPENDS
@@ -496,7 +496,7 @@ add_header_macro(
 
 add_header_macro(
   sys_mman
-  ../libc/hdrgen/yaml/sys/mman.yaml
+  ../libc/hdrgen/spec/sys/mman.yaml
   sys/mman.h.def
   sys/mman.h
   DEPENDS
@@ -509,7 +509,7 @@ add_header_macro(
 
 add_header_macro(
   sys_prctl
-  ../libc/hdrgen/yaml/sys/prctl.yaml
+  ../libc/hdrgen/spec/sys/prctl.yaml
   sys/prctl.h.def
   sys/prctl.h
   DEPENDS
@@ -526,7 +526,7 @@ add_header(
 
 add_header_macro(
   sys_random
-  ../libc/hdrgen/yaml/sys/random.yaml
+  ../libc/hdrgen/spec/sys/random.yaml
   sys/random.h.def
   sys/random.h
   DEPENDS
@@ -538,7 +538,7 @@ add_header_macro(
 
 add_header_macro(
   sys_resource
-  ../libc/hdrgen/yaml/sys/resource.yaml
+  ../libc/hdrgen/spec/sys/resource.yaml
   sys/resource.h.def
   sys/resource.h
   DEPENDS
@@ -550,7 +550,7 @@ add_header_macro(
 
 add_header_macro(
   sys_stat
-  ../libc/hdrgen/yaml/sys/stat.yaml
+  ../libc/hdrgen/spec/sys/stat.yaml
   sys/stat.h.def
   sys/stat.h
   DEPENDS
@@ -572,7 +572,7 @@ add_header_macro(
 
 add_header_macro(
   sys_select
-  ../libc/hdrgen/yaml/sys/select.yaml
+  ../libc/hdrgen/spec/sys/select.yaml
   sys/select.h.def
   sys/select.h
   DEPENDS
@@ -588,7 +588,7 @@ add_header_macro(
 
 add_header_macro(
   sys_sendfile
-  ../libc/hdrgen/yaml/sys/sendfile.yaml
+  ../libc/hdrgen/spec/sys/sendfile.yaml
   sys/sendfile.h.def
   sys/sendfile.h
   DEPENDS
@@ -600,7 +600,7 @@ add_header_macro(
 
 add_header_macro(
   sys_socket
-  ../libc/hdrgen/yaml/sys/socket.yaml
+  ../libc/hdrgen/spec/sys/socket.yaml
   sys/socket.h.def
   sys/socket.h
   DEPENDS
@@ -616,7 +616,7 @@ add_header_macro(
 
 add_header_macro(
   sys_statvfs
-  ../libc/hdrgen/yaml/sys/statvfs.yaml
+  ../libc/hdrgen/spec/sys/statvfs.yaml
   sys/statvfs.h.def
   sys/statvfs.h
   DEPENDS
@@ -626,7 +626,7 @@ add_header_macro(
 
 add_header_macro(
   sys_syscall
-  ../libc/hdrgen/yaml/sys/syscall.yaml
+  ../libc/hdrgen/spec/sys/syscall.yaml
   sys/syscall.h.def
   sys/syscall.h
   DEPENDS
@@ -634,7 +634,7 @@ add_header_macro(
 
 add_header_macro(
   sys_time
-  ../libc/hdrgen/yaml/sys/time.yaml
+  ../libc/hdrgen/spec/sys/time.yaml
   sys/time.h.def
   sys/time.h
   DEPENDS
@@ -645,7 +645,7 @@ add_header_macro(
 
 add_header_macro(
   sys_types
-  ../libc/hdrgen/yaml/sys/types.yaml
+  ../libc/hdrgen/spec/sys/types.yaml
   sys/types.h.def
   sys/types.h
   DEPENDS
@@ -675,7 +675,7 @@ add_header_macro(
 
 add_header_macro(
   sys_utsname
-  ../libc/hdrgen/yaml/sys/utsname.yaml
+  ../libc/hdrgen/spec/sys/utsname.yaml
   sys/utsname.h.def
   sys/utsname.h
   DEPENDS
@@ -685,7 +685,7 @@ add_header_macro(
 
 add_header_macro(
   sys_wait
-  ../libc/hdrgen/yaml/sys/wait.yaml
+  ../libc/hdrgen/spec/sys/wait.yaml
   sys/wait.h.def
   sys/wait.h
   DEPENDS
@@ -698,7 +698,7 @@ add_header_macro(
 
 add_header_macro(
   termios
-  ../libc/hdrgen/yaml/termios.yaml
+  ../libc/hdrgen/spec/termios.yaml
   termios.h.def
   termios.h
   DEPENDS
@@ -713,7 +713,7 @@ add_header_macro(
 
 add_header_macro(
   uchar
-  ../libc/hdrgen/yaml/uchar.yaml
+  ../libc/hdrgen/spec/uchar.yaml
   uchar.h.def
   uchar.h
   DEPENDS
@@ -726,7 +726,7 @@ add_header_macro(
 
 add_header_macro(
   wchar
-  ../libc/hdrgen/yaml/wchar.yaml
+  ../libc/hdrgen/spec/wchar.yaml
   wchar.h.d...
[truncated]

RossComputerGuy

Looks good.

vinay-deshmukh · 2024-12-23T06:22:55Z

@RossComputerGuy I don't have commit/approval access yet. Can you also merge the PR for me? Thanks!

RossComputerGuy · 2024-12-23T06:23:50Z

Neither do I lol.

whiteio

Noticed that libc/hdrgen/yaml/ was mentioned in the docs (libc/docs/dev/header_generation.rst) a few times, probably worth updating these too:

jhuber6

I think this is fine, but would like someone else from the libc project to chime in. Might be awhile because of the holidays.

vinay-deshmukh · 2025-01-01T05:34:12Z

@jhuber can you take a look at this again please? Thanks
edit:
My bad, I thought solving the merge conflicts might remove the earlier approval.

jhuber6

Even thought it's the holidays, guess it's been long enough without anyone complaining that this is probably fine.

jhuber6 · 2025-01-02T02:17:48Z

Can you verify if #121443 fixed the issue?

vinay-deshmukh · 2025-01-02T04:04:54Z

I've checked out main at 23ec9ee, and now I don't see the issue mentioned in #120736 (i.e. header generation seems to pass)

so I can close this PR.

I still see: #113790, but I can try to raise a PR for that soon then

vinay-deshmukh added 2 commits December 23, 2024 10:09

Rename libc/hdrgen/yaml/ to libc/hdrgen/spec/

84a0c57

To avoid python module lookup conflict

Typo: with -> will

59e8db5

vinay-deshmukh force-pushed the vinay-issue-120736 branch from 75b47e0 to 59e8db5 Compare December 23, 2024 04:40

vinay-deshmukh marked this pull request as ready for review December 23, 2024 04:47

llvmbot added the libc label Dec 23, 2024

vinay-deshmukh mentioned this pull request Dec 23, 2024

[libc] ninja check-libc: AttributeError: module 'yaml' has no attribute 'safe_load' #120736

Closed

RossComputerGuy approved these changes Dec 23, 2024

View reviewed changes

jhuber6 requested review from nickdesaulniers, lntue and michaelrj-google December 23, 2024 13:51

whiteio reviewed Dec 23, 2024

View reviewed changes

vinay-deshmukh added 2 commits December 24, 2024 07:23

Update docs with new directory name

0be1017

Merge branch 'main' into vinay-issue-120736

6613e19

vinay-deshmukh requested a review from whiteio December 25, 2024 03:39

Merge branch 'main' into vinay-issue-120736

cc560fc

jhuber6 approved these changes Dec 26, 2024

View reviewed changes

vinay-deshmukh added 3 commits December 29, 2024 22:50

Merge branch 'main' into vinay-issue-120736

5def66e

Merge remote-tracking branch 'upstream/main' into vinay-issue-120736

703c716

typos

cb69445

vinay-deshmukh changed the title ~~Rename libc/hdrgen/yaml/ to libc/hdrgen/spec/~~ Rename libc/utils/hdrgen/yaml/ to libc/utils/hdrgen/spec/ Jan 1, 2025

jhuber6 approved these changes Jan 1, 2025

View reviewed changes

jhuber6 mentioned this pull request Jan 1, 2025

[libc] Move hdrgen yaml files into include/ #121443

Merged

vinay-deshmukh closed this Jan 2, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rename `libc/utils/hdrgen/yaml/` to `libc/utils/hdrgen/spec/` #120931

Rename `libc/utils/hdrgen/yaml/` to `libc/utils/hdrgen/spec/` #120931

Uh oh!

vinay-deshmukh commented Dec 23, 2024 •

edited

Loading

Uh oh!

llvmbot commented Dec 23, 2024

Uh oh!

RossComputerGuy left a comment

Uh oh!

vinay-deshmukh commented Dec 23, 2024

Uh oh!

RossComputerGuy commented Dec 23, 2024

Uh oh!

whiteio left a comment

Uh oh!

jhuber6 left a comment

Uh oh!

vinay-deshmukh commented Jan 1, 2025 •

edited

Loading

Uh oh!

jhuber6 left a comment

Uh oh!

jhuber6 commented Jan 2, 2025

Uh oh!

vinay-deshmukh commented Jan 2, 2025

Uh oh!

Uh oh!

Rename libc/utils/hdrgen/yaml/ to libc/utils/hdrgen/spec/ #120931

Rename libc/utils/hdrgen/yaml/ to libc/utils/hdrgen/spec/ #120931

Uh oh!

Conversation

vinay-deshmukh commented Dec 23, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

llvmbot commented Dec 23, 2024

Uh oh!

RossComputerGuy left a comment

Choose a reason for hiding this comment

Uh oh!

vinay-deshmukh commented Dec 23, 2024

Uh oh!

RossComputerGuy commented Dec 23, 2024

Uh oh!

whiteio left a comment

Choose a reason for hiding this comment

Uh oh!

jhuber6 left a comment

Choose a reason for hiding this comment

Uh oh!

vinay-deshmukh commented Jan 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jhuber6 left a comment

Choose a reason for hiding this comment

Uh oh!

jhuber6 commented Jan 2, 2025

Uh oh!

vinay-deshmukh commented Jan 2, 2025

Uh oh!

Uh oh!

Rename `libc/utils/hdrgen/yaml/` to `libc/utils/hdrgen/spec/` #120931

Rename `libc/utils/hdrgen/yaml/` to `libc/utils/hdrgen/spec/` #120931

vinay-deshmukh commented Dec 23, 2024 •

edited

Loading

vinay-deshmukh commented Jan 1, 2025 •

edited

Loading