Make Thread#to_s consistent with Method and Proc to_s

spec/ruby/core/thread/inspect_spec.rb

@@ -1,44 +1,6 @@
 require_relative '../../spec_helper'
-require_relative 'fixtures/classes'
+require_relative 'shared/to_s'
 
 describe "Thread#inspect" do
-  it "can check it's own status" do
-    ThreadSpecs.status_of_current_thread.inspect.should include('run')
-  end
-
-  it "describes a running thread" do
-    ThreadSpecs.status_of_running_thread.inspect.should include('run')
-  end
-
-  it "describes a sleeping thread" do
-    ThreadSpecs.status_of_sleeping_thread.inspect.should include('sleep')
-  end
-
-  it "describes a blocked thread" do
-    ThreadSpecs.status_of_blocked_thread.inspect.should include('sleep')
-  end
-
-  it "describes a completed thread" do
-    ThreadSpecs.status_of_completed_thread.inspect.should include('dead')
-  end
-
-  it "describes a killed thread" do
-    ThreadSpecs.status_of_killed_thread.inspect.should include('dead')
-  end
-
-  it "describes a thread with an uncaught exception" do
-    ThreadSpecs.status_of_thread_with_uncaught_exception.inspect.should include('dead')
-  end
-
-  it "describes a dying sleeping thread" do
-    ThreadSpecs.status_of_dying_sleeping_thread.inspect.should include('sleep')
-  end
-
-  it "reports aborting on a killed thread" do
-    ThreadSpecs.status_of_dying_running_thread.inspect.should include('aborting')
-  end
-
-  it "reports aborting on a killed thread after sleep" do
-    ThreadSpecs.status_of_dying_thread_after_sleep.inspect.should include('aborting')
-  end
+  it_behaves_like :thread_to_s, :inspect
 end

spec/ruby/core/thread/shared/to_s.rb

@@ -0,0 +1,53 @@
+require_relative '../fixtures/classes'
+
+describe :thread_to_s, shared: true do
+  sep = ruby_version_is("2.7") ? " " : "@"
+
+  it "returns a description including file and line number" do
+    Thread.new { "hello" }.send(@method).should =~ /^#<Thread:([^ ]*?)#{sep}#{Regexp.escape __FILE__}:#{__LINE__ } \w+>$/
+  end
+
+  it "has a binary encoding" do
+    Thread.new { "hello" }.send(@method).encoding.should == Encoding::BINARY
+  end
+
+  it "can check it's own status" do
+    ThreadSpecs.status_of_current_thread.inspect.should include('run')
+  end
+
+  it "describes a running thread" do
+    ThreadSpecs.status_of_running_thread.inspect.should include('run')
+  end
+
+  it "describes a sleeping thread" do
+    ThreadSpecs.status_of_sleeping_thread.inspect.should include('sleep')
+  end
+
+  it "describes a blocked thread" do
+    ThreadSpecs.status_of_blocked_thread.inspect.should include('sleep')
+  end
+
+  it "describes a completed thread" do
+    ThreadSpecs.status_of_completed_thread.inspect.should include('dead')
+  end
+
+  it "describes a killed thread" do
+    ThreadSpecs.status_of_killed_thread.inspect.should include('dead')
+  end
+
+  it "describes a thread with an uncaught exception" do
+    ThreadSpecs.status_of_thread_with_uncaught_exception.inspect.should include('dead')
+  end
+
+  it "describes a dying sleeping thread" do
+    ThreadSpecs.status_of_dying_sleeping_thread.inspect.should include('sleep')
+  end
+
+  it "reports aborting on a killed thread" do
+    ThreadSpecs.status_of_dying_running_thread.inspect.should include('aborting')
+  end
+
+  it "reports aborting on a killed thread after sleep" do
+    ThreadSpecs.status_of_dying_thread_after_sleep.inspect.should include('aborting')
+  end
+end

spec/ruby/core/thread/to_s_spec.rb

@@ -0,0 +1,6 @@
+require_relative '../../spec_helper'
+require_relative 'shared/to_s'
+
+describe "Thread#to_s" do
+  it_behaves_like :thread_to_s, :to_s
+end

thread.c

@@ -3181,7 +3181,7 @@ rb_thread_to_s(VALUE thread)
         rb_str_catf(str, "@%"PRIsVALUE, target_th->name);
     }
     if ((loc = threadptr_invoke_proc_location(target_th)) != Qnil) {
-        rb_str_catf(str, "@%"PRIsVALUE":%"PRIsVALUE,
+        rb_str_catf(str, " %"PRIsVALUE":%"PRIsVALUE,
                     RARRAY_AREF(loc, 0), RARRAY_AREF(loc, 1));
         rb_gc_force_recycle(loc);
     }