Introduce IO::TimeoutError < IOError.

ruby · Oct 7, 2022 · cfbc3a2 · cfbc3a2
1 parent 68c53de
commit cfbc3a2
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/error.c b/error.c
@@ -1097,7 +1097,6 @@ VALUE rb_eRuntimeError;
 VALUE rb_eFrozenError;
 VALUE rb_eTypeError;
 VALUE rb_eArgError;
-VALUE rb_eTimeoutError;
 VALUE rb_eIndexError;
 VALUE rb_eKeyError;
 VALUE rb_eRangeError;
@@ -3002,7 +3001,6 @@ Init_Exception(void)
     rb_eStandardError = rb_define_class("StandardError", rb_eException);
     rb_eTypeError     = rb_define_class("TypeError", rb_eStandardError);
     rb_eArgError      = rb_define_class("ArgumentError", rb_eStandardError);
-    rb_eTimeoutError  = rb_define_class("TimeoutError", rb_eStandardError);
     rb_eIndexError    = rb_define_class("IndexError", rb_eStandardError);
     rb_eKeyError      = rb_define_class("KeyError", rb_eIndexError);
     rb_define_method(rb_eKeyError, "initialize", key_err_initialize, -1);

diff --git a/include/ruby/internal/globals.h b/include/ruby/internal/globals.h
@@ -113,7 +113,6 @@ RUBY_EXTERN VALUE rb_eInterrupt;                 /**< `Interrupt` exception. */
 RUBY_EXTERN VALUE rb_eSignal;                    /**< `SignalException` exception. */
 RUBY_EXTERN VALUE rb_eFatal;                     /**< `fatal` exception. */
 RUBY_EXTERN VALUE rb_eArgError;                  /**< `ArgumentError` exception. */
-RUBY_EXTERN VALUE rb_eTimeoutError;              /**< `TimeoutError` exception. */
 RUBY_EXTERN VALUE rb_eEOFError;                  /**< `EOFError` exception. */
 RUBY_EXTERN VALUE rb_eIndexError;                /**< `IndexError` exception. */
 RUBY_EXTERN VALUE rb_eStopIteration;             /**< `StopIteration` exception. */

diff --git a/io.c b/io.c
@@ -14855,7 +14855,7 @@ Init_IO(void)
     rb_cIO = rb_define_class("IO", rb_cObject);
     rb_include_module(rb_cIO, rb_mEnumerable);
 
-    rb_eIOTimeoutError = rb_define_class_under(rb_cIO, "TimeoutError", rb_eTimeoutError);
+    rb_eIOTimeoutError = rb_define_class_under(rb_cIO, "TimeoutError", rb_eIOError);
 
     rb_define_const(rb_cIO, "READABLE", INT2NUM(RUBY_IO_READABLE));
     rb_define_const(rb_cIO, "WRITABLE", INT2NUM(RUBY_IO_WRITABLE));