sed -i s|ruby/3|ruby/impl|g

This shall fix compile errors.

24 files changed, 48 insertions, 48 deletions

diff --git a/include/ruby/impl/attr/alloc_size.h b/include/ruby/impl/attr/alloc_size.h
index 5d4ece08a1..4d514ca00e 100644
--- a/include/ruby/impl/attr/alloc_size.h
+++ b/include/ruby/impl/attr/alloc_size.h
@@ -20,7 +20,7 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_ALLOC_SIZE.
  */
-#include "ruby/3/has/attribute.h"
+#include "ruby/impl/has/attribute.h"
 
 /** Wraps (or simulates) `__attribute__((alloc_size))` */
 #if RUBY3_HAS_ATTRIBUTE(alloc_size)
diff --git a/include/ruby/impl/attr/artificial.h b/include/ruby/impl/attr/artificial.h
index f5450e3467..e33d536e3d 100644
--- a/include/ruby/impl/attr/artificial.h
+++ b/include/ruby/impl/attr/artificial.h
@@ -34,7 +34,7 @@
  *      case it gets  vital to know where the inlining  happened in the callee.
  *      See also https://stackoverflow.com/a/21936099
  */
-#include "ruby/3/has/attribute.h"
+#include "ruby/impl/has/attribute.h"
 
 /** Wraps (or simulates) `__attribute__((artificial))` */
 #if RUBY3_HAS_ATTRIBUTE(artificial)
diff --git a/include/ruby/impl/attr/cold.h b/include/ruby/impl/attr/cold.h
index 3822f0a975..ed50a5e266 100644
--- a/include/ruby/impl/attr/cold.h
+++ b/include/ruby/impl/attr/cold.h
@@ -20,8 +20,8 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_COLD.
  */
-#include "ruby/3/compiler_is.h"
-#include "ruby/3/has/attribute.h"
+#include "ruby/impl/compiler_is.h"
+#include "ruby/impl/has/attribute.h"
 
 /** Wraps (or simulates) `__attribute__((cold))` */
 #if RUBY3_COMPILER_IS(SunPro)
diff --git a/include/ruby/impl/attr/const.h b/include/ruby/impl/attr/const.h
index 6c36e9aab2..7054b916ac 100644
--- a/include/ruby/impl/attr/const.h
+++ b/include/ruby/impl/attr/const.h
@@ -20,9 +20,9 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_CONST.
  */
-#include "ruby/3/compiler_since.h"
-#include "ruby/3/has/attribute.h"
-#include "ruby/3/has/declspec_attribute.h"
+#include "ruby/impl/compiler_since.h"
+#include "ruby/impl/has/attribute.h"
+#include "ruby/impl/has/declspec_attribute.h"
 
 /** Wraps (or simulates) `__attribute__((const))` */
 #if RUBY3_HAS_ATTRIBUTE(const)
diff --git a/include/ruby/impl/attr/constexpr.h b/include/ruby/impl/attr/constexpr.h
index 576ec7fb8f..695ee85c9c 100644
--- a/include/ruby/impl/attr/constexpr.h
+++ b/include/ruby/impl/attr/constexpr.h
@@ -20,9 +20,9 @@
  *             extension libraries. They could be written in C++98.
  * @brief      #RUBY3_ATTR_CONSTEXPR.
  */
-#include "ruby/3/has/feature.h"
-#include "ruby/3/compiler_is.h"
-#include "ruby/3/token_paste.h"
+#include "ruby/impl/has/feature.h"
+#include "ruby/impl/compiler_is.h"
+#include "ruby/impl/token_paste.h"
 
 /** @cond INTERNAL_MACRO */
 #if ! defined(__cplusplus)
diff --git a/include/ruby/impl/attr/deprecated.h b/include/ruby/impl/attr/deprecated.h
index 5c3f508ffc..a9195b17e8 100644
--- a/include/ruby/impl/attr/deprecated.h
+++ b/include/ruby/impl/attr/deprecated.h
@@ -20,12 +20,12 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_DEPRECATED.
  */
-#include "ruby/3/compiler_since.h"
-#include "ruby/3/has/attribute.h"
-#include "ruby/3/has/c_attribute.h"
-#include "ruby/3/has/cpp_attribute.h"
-#include "ruby/3/has/declspec_attribute.h"
-#include "ruby/3/has/extension.h"
+#include "ruby/impl/compiler_since.h"
+#include "ruby/impl/has/attribute.h"
+#include "ruby/impl/has/c_attribute.h"
+#include "ruby/impl/has/cpp_attribute.h"
+#include "ruby/impl/has/declspec_attribute.h"
+#include "ruby/impl/has/extension.h"
 
 /** Wraps (or simulates) `[[deprecated]]` */
 #if RUBY3_HAS_EXTENSION(attribute_deprecated_with_message)
diff --git a/include/ruby/impl/attr/diagnose_if.h b/include/ruby/impl/attr/diagnose_if.h
index 2f09abc94d..13399600d1 100644
--- a/include/ruby/impl/attr/diagnose_if.h
+++ b/include/ruby/impl/attr/diagnose_if.h
@@ -20,8 +20,8 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_DIAGNOSE_IF.
  */
-#include "ruby/3/has/attribute.h"
-#include "ruby/3/warning_push.h"
+#include "ruby/impl/has/attribute.h"
+#include "ruby/impl/warning_push.h"
 
 /** Wraps (or simulates) `__attribute__((diagnose_if))` */
 #if RUBY3_COMPILER_BEFORE(Clang, 5, 0, 0)
diff --git a/include/ruby/impl/attr/enum_extensibility.h b/include/ruby/impl/attr/enum_extensibility.h
index 15a5b063f2..c7a64933d8 100644
--- a/include/ruby/impl/attr/enum_extensibility.h
+++ b/include/ruby/impl/attr/enum_extensibility.h
@@ -20,7 +20,7 @@
  *             extension libraries. They could be written in C++98.
  * @brief      #RUBY3_ATTR_ENUM_EXTENSIBILITY.
  */
-#include "ruby/3/has/attribute.h"
+#include "ruby/impl/has/attribute.h"
 
 /** Wraps (or simulates) `__attribute__((enum_extensibility))` */
 #if RUBY3_HAS_ATTRIBUTE(enum_extensibility)
diff --git a/include/ruby/impl/attr/error.h b/include/ruby/impl/attr/error.h
index 53628259a0..c0d5ed51af 100644
--- a/include/ruby/impl/attr/error.h
+++ b/include/ruby/impl/attr/error.h
@@ -20,7 +20,7 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_ERROR.
  */
-#include "ruby/3/has/attribute.h"
+#include "ruby/impl/has/attribute.h"
 
 /** Wraps (or simulates) `__attribute__((error))` */
 #if RUBY3_HAS_ATTRIBUTE(error)
diff --git a/include/ruby/impl/attr/flag_enum.h b/include/ruby/impl/attr/flag_enum.h
index 2081c9c3ed..0649869b4a 100644
--- a/include/ruby/impl/attr/flag_enum.h
+++ b/include/ruby/impl/attr/flag_enum.h
@@ -21,7 +21,7 @@
  * @brief      Defines #RUBY3_ATTR_FLAG_ENUM.
  * @see        https://clang.llvm.org/docs/AttributeReference.html#flag_enum
  */
-#include "ruby/3/has/attribute.h"
+#include "ruby/impl/has/attribute.h"
 
 /** Wraps (or simulates) `__attribute__((flag_enum)` */
 #if RUBY3_HAS_ATTRIBUTE(flag_enum)
diff --git a/include/ruby/impl/attr/forceinline.h b/include/ruby/impl/attr/forceinline.h
index bd622eddce..95fe2b843a 100644
--- a/include/ruby/impl/attr/forceinline.h
+++ b/include/ruby/impl/attr/forceinline.h
@@ -20,8 +20,8 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_FORCEINLINE.
  */
-#include "ruby/3/compiler_since.h"
-#include "ruby/3/has/attribute.h"
+#include "ruby/impl/compiler_since.h"
+#include "ruby/impl/has/attribute.h"
 
 /**
  * Wraps (or  simulates) `__forceinline`.  MSVC complains  on declarations like
diff --git a/include/ruby/impl/attr/format.h b/include/ruby/impl/attr/format.h
index 2624179bda..0ae980afcd 100644
--- a/include/ruby/impl/attr/format.h
+++ b/include/ruby/impl/attr/format.h
@@ -20,7 +20,7 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_FORMAT.
  */
-#include "ruby/3/has/attribute.h"
+#include "ruby/impl/has/attribute.h"
 
 /** Wraps (or simulates) `__attribute__((format))` */
 #if RUBY3_HAS_ATTRIBUTE(format)
diff --git a/include/ruby/impl/attr/maybe_unused.h b/include/ruby/impl/attr/maybe_unused.h
index 71904dffa4..decb338c39 100644
--- a/include/ruby/impl/attr/maybe_unused.h
+++ b/include/ruby/impl/attr/maybe_unused.h
@@ -20,9 +20,9 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_MAYBE_UNUSED.
  */
-#include "ruby/3/has/attribute.h"
-#include "ruby/3/has/c_attribute.h"
-#include "ruby/3/has/cpp_attribute.h"
+#include "ruby/impl/has/attribute.h"
+#include "ruby/impl/has/c_attribute.h"
+#include "ruby/impl/has/cpp_attribute.h"
 
 /** Wraps  (or simulates)  `[[maybe_unused]]` */
 #if RUBY3_HAS_CPP_ATTRIBUTE(maybe_unused)
diff --git a/include/ruby/impl/attr/noalias.h b/include/ruby/impl/attr/noalias.h
index 49ad11999d..fc1012f45e 100644
--- a/include/ruby/impl/attr/noalias.h
+++ b/include/ruby/impl/attr/noalias.h
@@ -46,7 +46,7 @@
  *       has  to be  passed  to the  function as  a  pointer.  ::VALUE  -taking
  *       functions thus cannot be attributed as such.
  */
-#include "ruby/3/has/declspec_attribute.h"
+#include "ruby/impl/has/declspec_attribute.h"
 
 /** Wraps (or simulates) `__declspec((noalias))` */
 #if RUBY3_HAS_DECLSPEC_ATTRIBUTE(noalias)
diff --git a/include/ruby/impl/attr/nodiscard.h b/include/ruby/impl/attr/nodiscard.h
index 6168bb9002..394221969b 100644
--- a/include/ruby/impl/attr/nodiscard.h
+++ b/include/ruby/impl/attr/nodiscard.h
@@ -20,9 +20,9 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_NODISCARD.
  */
-#include "ruby/3/has/attribute.h"
-#include "ruby/3/has/c_attribute.h"
-#include "ruby/3/has/cpp_attribute.h"
+#include "ruby/impl/has/attribute.h"
+#include "ruby/impl/has/c_attribute.h"
+#include "ruby/impl/has/cpp_attribute.h"
 
 /**
  * Wraps  (or simulates)  `[[nodiscard]]`.  In  C++  (at least  since C++20)  a
diff --git a/include/ruby/impl/attr/noexcept.h b/include/ruby/impl/attr/noexcept.h
index aff3b2cb1b..ee7329b735 100644
--- a/include/ruby/impl/attr/noexcept.h
+++ b/include/ruby/impl/attr/noexcept.h
@@ -61,8 +61,8 @@
  *       Itanium C++ ABI has zero-cost  exception handling), but does impact on
  *       generated binary size.  This is bad.
  */
-#include "ruby/3/compiler_since.h"
-#include "ruby/3/has/feature.h"
+#include "ruby/impl/compiler_since.h"
+#include "ruby/impl/has/feature.h"
 
 /** Wraps (or simulates) C++11 `noexcept` */
 #if ! defined(__cplusplus)
diff --git a/include/ruby/impl/attr/noinline.h b/include/ruby/impl/attr/noinline.h
index 4437f8a32f..58ffbe207c 100644
--- a/include/ruby/impl/attr/noinline.h
+++ b/include/ruby/impl/attr/noinline.h
@@ -20,8 +20,8 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_NOINLINE.
  */
-#include "ruby/3/has/attribute.h"
-#include "ruby/3/has/declspec_attribute.h"
+#include "ruby/impl/has/attribute.h"
+#include "ruby/impl/has/declspec_attribute.h"
 
 /** Wraps (or simulates) `__declspec(noinline)` */
 #if RUBY3_HAS_DECLSPEC_ATTRIBUTE(noinline)
diff --git a/include/ruby/impl/attr/nonnull.h b/include/ruby/impl/attr/nonnull.h
index 01b5820c1b..ad883f04db 100644
--- a/include/ruby/impl/attr/nonnull.h
+++ b/include/ruby/impl/attr/nonnull.h
@@ -20,7 +20,7 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_NONNULL.
  */
-#include "ruby/3/has/attribute.h"
+#include "ruby/impl/has/attribute.h"
 
 /** Wraps (or simulates) `__attribute__((nonnull))` */
 #if RUBY3_HAS_ATTRIBUTE(nonnull)
diff --git a/include/ruby/impl/attr/noreturn.h b/include/ruby/impl/attr/noreturn.h
index 999a76b8e5..90cec9a01a 100644
--- a/include/ruby/impl/attr/noreturn.h
+++ b/include/ruby/impl/attr/noreturn.h
@@ -20,10 +20,10 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_NORETURN.
  */
-#include "ruby/3/compiler_since.h"
-#include "ruby/3/has/attribute.h"
-#include "ruby/3/has/cpp_attribute.h"
-#include "ruby/3/has/declspec_attribute.h"
+#include "ruby/impl/compiler_since.h"
+#include "ruby/impl/has/attribute.h"
+#include "ruby/impl/has/cpp_attribute.h"
+#include "ruby/impl/has/declspec_attribute.h"
 
 /** Wraps (or simulates) `[[noreturn]]` */
 #if RUBY3_COMPILER_SINCE(SunPro, 5, 10, 0)
diff --git a/include/ruby/impl/attr/pure.h b/include/ruby/impl/attr/pure.h
index b9ab3622ca..e2cd27279e 100644
--- a/include/ruby/impl/attr/pure.h
+++ b/include/ruby/impl/attr/pure.h
@@ -20,8 +20,8 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_PURE.
  */
-#include "ruby/3/compiler_since.h"
-#include "ruby/3/has/attribute.h"
+#include "ruby/impl/compiler_since.h"
+#include "ruby/impl/has/attribute.h"
 #include "ruby/assert.h"
 
 /** Wraps (or simulates) `__attribute__((pure))` */
diff --git a/include/ruby/impl/attr/restrict.h b/include/ruby/impl/attr/restrict.h
index 95c85f45ce..09240a2563 100644
--- a/include/ruby/impl/attr/restrict.h
+++ b/include/ruby/impl/attr/restrict.h
@@ -20,9 +20,9 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_RESTRICT.
  */
-#include "ruby/3/compiler_since.h"
-#include "ruby/3/has/attribute.h"
-#include "ruby/3/token_paste.h"
+#include "ruby/impl/compiler_since.h"
+#include "ruby/impl/has/attribute.h"
+#include "ruby/impl/token_paste.h"
 
 /* :FIXME:  config.h  includes conflicting  `#define  restrict`.   MSVC can  be
  * detected  using  `RUBY3_COMPILER_SINCE()`, but  Clang  &  family cannot  use
diff --git a/include/ruby/impl/attr/returns_nonnull.h b/include/ruby/impl/attr/returns_nonnull.h
index 786e7e72ee..3eb9180cab 100644
--- a/include/ruby/impl/attr/returns_nonnull.h
+++ b/include/ruby/impl/attr/returns_nonnull.h
@@ -20,7 +20,7 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_RETURNS_NONNULL.
  */
-#include "ruby/3/has/attribute.h"
+#include "ruby/impl/has/attribute.h"
 
 /** Wraps (or simulates) `__attribute__((returns_nonnull))` */
 #if defined(_Ret_nonnull_)
diff --git a/include/ruby/impl/attr/warning.h b/include/ruby/impl/attr/warning.h
index a83537e209..5f665c9d17 100644
--- a/include/ruby/impl/attr/warning.h
+++ b/include/ruby/impl/attr/warning.h
@@ -20,7 +20,7 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_WARNING.
  */
-#include "ruby/3/has/attribute.h"
+#include "ruby/impl/has/attribute.h"
 
 /** Wraps (or simulates) `__attribute__((warning))` */
 #if RUBY3_HAS_ATTRIBUTE(warning)
diff --git a/include/ruby/impl/attr/weakref.h b/include/ruby/impl/attr/weakref.h
index e9c38f92e7..04d8f77c13 100644
--- a/include/ruby/impl/attr/weakref.h
+++ b/include/ruby/impl/attr/weakref.h
@@ -20,7 +20,7 @@
  *             extension libraries. They could be written in C++98.
  * @brief      Defines #RUBY3_ATTR_WEAKREF.
  */
-#include "ruby/3/has/attribute.h"
+#include "ruby/impl/has/attribute.h"
 
 /** Wraps (or simulates) `__attribute__((weakref))` */
 #if RUBY3_HAS_ATTRIBUTE(weakref)