11 files changed, 13 insertions, 13 deletions
diff --git a/lib/rubygems/commands/stale_command.rb b/lib/rubygems/commands/stale_command.rb
index 9468fce3f4..2812179d92 100644
--- a/lib/rubygems/commands/stale_command.rb
+++ b/lib/rubygems/commands/stale_command.rb
@@ -17,7 +17,7 @@ longer using.
   end
 
   def usage # :nodoc:
-    "#{program_name}"
+    program_name.to_s
   end
 
   def execute
diff --git a/lib/rubygems/deprecate.rb b/lib/rubygems/deprecate.rb
index ffe07d14d2..c0554aa763 100644
--- a/lib/rubygems/deprecate.rb
+++ b/lib/rubygems/deprecate.rb
@@ -154,7 +154,7 @@ module Gem::Deprecate
                 ". It will be removed in Rubygems #{version}.\n",
         ]
 
-        alert_warning "#{msg.join}" unless Gem::Deprecate.skip
+        alert_warning msg.join.to_s unless Gem::Deprecate.skip
       end
     end
   end
diff --git a/lib/rubygems/gemcutter_utilities.rb b/lib/rubygems/gemcutter_utilities.rb
index 6ac08117ce..3d72e28dbe 100644
--- a/lib/rubygems/gemcutter_utilities.rb
+++ b/lib/rubygems/gemcutter_utilities.rb
@@ -269,7 +269,7 @@ module Gem::GemcutterUtilities
     else
       say "Please select scopes you want to enable for the API key (y/n)"
       API_SCOPES.each do |scope|
-        selected = ask_yes_no("#{scope}", false)
+        selected = ask_yes_no(scope.to_s, false)
         scope_params[scope] = true if selected
       end
       say "\n"
diff --git a/lib/rubygems/resolver/conflict.rb b/lib/rubygems/resolver/conflict.rb
index aba6d73ea7..fa0d3f089e 100644
--- a/lib/rubygems/resolver/conflict.rb
+++ b/lib/rubygems/resolver/conflict.rb
@@ -131,7 +131,7 @@ class Gem::Resolver::Conflict
 
         current = current.parent
       when Gem::Resolver::DependencyRequest then
-        path << "#{current.dependency}"
+        path << current.dependency.to_s
 
         current = current.requester
       else
diff --git a/lib/rubygems/s3_uri_signer.rb b/lib/rubygems/s3_uri_signer.rb
index 5522753af5..ae085c39ff 100644
--- a/lib/rubygems/s3_uri_signer.rb
+++ b/lib/rubygems/s3_uri_signer.rb
@@ -10,7 +10,7 @@ class Gem::S3URISigner
     end
 
     def to_s # :nodoc:
-      "#{super}"
+      (super).to_s
     end
   end
 
@@ -20,7 +20,7 @@ class Gem::S3URISigner
     end
 
     def to_s # :nodoc:
-      "#{super}"
+      (super).to_s
     end
   end
 
diff --git a/lib/rubygems/security.rb b/lib/rubygems/security.rb
index 606cd241f7..5832db7f8b 100644
--- a/lib/rubygems/security.rb
+++ b/lib/rubygems/security.rb
@@ -510,7 +510,7 @@ module Gem::Security
                    extensions = EXTENSIONS)
     raise Gem::Security::Exception,
           "incorrect signing key for re-signing " +
-          "#{expired_certificate.subject}" unless
+          expired_certificate.subject.to_s unless
       expired_certificate.check_private_key(private_key)
 
     unless expired_certificate.subject.to_s ==
diff --git a/test/rubygems/test_gem_commands_pristine_command.rb b/test/rubygems/test_gem_commands_pristine_command.rb
index db1583bcd3..10244a230c 100644
--- a/test/rubygems/test_gem_commands_pristine_command.rb
+++ b/test/rubygems/test_gem_commands_pristine_command.rb
@@ -595,7 +595,7 @@ class TestGemCommandsPristineCommand < Gem::TestCase
     FileUtils.rm gem_exec
     FileUtils.rm gem_bindir
 
-    @cmd.handle_options ["--all", "--only-executables", "--bindir", "#{gem_bindir}"]
+    @cmd.handle_options ["--all", "--only-executables", "--bindir", gem_bindir.to_s]
 
     use_ui @ui do
       @cmd.execute
diff --git a/test/rubygems/test_gem_indexer.rb b/test/rubygems/test_gem_indexer.rb
index c07e12d321..eae6f344b5 100644
--- a/test/rubygems/test_gem_indexer.rb
+++ b/test/rubygems/test_gem_indexer.rb
@@ -160,8 +160,8 @@ class TestGemIndexer < Gem::TestCase
     assert_indexed marshal_quickdir, "#{File.basename(@a1.spec_file)}.rz"
     assert_indexed marshal_quickdir, "#{File.basename(@a2.spec_file)}.rz"
 
-    refute_indexed quickdir, "#{File.basename(@c1_2.spec_file)}"
-    refute_indexed marshal_quickdir, "#{File.basename(@c1_2.spec_file)}"
+    refute_indexed quickdir, File.basename(@c1_2.spec_file).to_s
+    refute_indexed marshal_quickdir, File.basename(@c1_2.spec_file).to_s
 
     assert_indexed @indexerdir, "specs.#{@marshal_version}"
     assert_indexed @indexerdir, "specs.#{@marshal_version}.gz"
diff --git a/test/rubygems/test_gem_resolver_api_set.rb b/test/rubygems/test_gem_resolver_api_set.rb
index 17c6c49a70..7d3a5ee77d 100644
--- a/test/rubygems/test_gem_resolver_api_set.rb
+++ b/test/rubygems/test_gem_resolver_api_set.rb
@@ -29,7 +29,7 @@ class TestGemResolverAPISet < Gem::TestCase
     set = @DR::APISet.new @dep_uri
 
     assert_equal URI("#{@gem_repo}info/"), set.dep_uri
-    assert_equal URI("#{@gem_repo}"), set.uri
+    assert_equal URI(@gem_repo.to_s), set.uri
   end
 
   def test_find_all
diff --git a/test/rubygems/test_gem_security.rb b/test/rubygems/test_gem_security.rb
index 0aecccdb27..9257fa336a 100644
--- a/test/rubygems/test_gem_security.rb
+++ b/test/rubygems/test_gem_security.rb
@@ -182,7 +182,7 @@ class TestGemSecurity < Gem::TestCase
     end
 
     assert_equal "incorrect signing key for re-signing " +
-                 "#{ALTERNATE_CERT.subject}",
+                 ALTERNATE_CERT.subject.to_s,
                  e.message
   end
 
diff --git a/test/rubygems/test_require.rb b/test/rubygems/test_require.rb
index 543a382cc4..0eee4676b5 100644
--- a/test/rubygems/test_require.rb
+++ b/test/rubygems/test_require.rb
@@ -383,7 +383,7 @@ class TestGemRequire < Gem::TestCase
 
     # Remove an old default gem version directly from disk as if someone ran
     # gem cleanup.
-    FileUtils.rm_rf(File.join(@gemhome, "#{b1.full_name}"))
+    FileUtils.rm_rf(File.join(@gemhome, b1.full_name.to_s))
     FileUtils.rm_rf(File.join(@gemhome, "specifications", "default", "#{b1.full_name}.gemspec"))
 
     # Require gems that have not been removed.