merge r23449, r23453.

* lib/rss/content/*, lib/rss/dublincore/*: fix circular require.
* test/test_maker_atom_feed.rb,
  test/test_maker_atom_entry.rb: suppress warnings.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 4 insertions, 4 deletions

diff --git a/test/rss/test_maker_atom_entry.rb b/test/rss/test_maker_atom_entry.rb
index c9b9f89537..94e4255e9e 100644
--- a/test/rss/test_maker_atom_entry.rb
+++ b/test/rss/test_maker_atom_entry.rb
@@ -381,7 +381,7 @@ module RSS
         end
       end
       assert_equal(date, feed.items[0].updated.content)
-      assert_equal([date], feed.items[0].dc_dates.collect {|date| date.value})
+      assert_equal([date], feed.items[0].dc_dates.collect {|_date| _date.value})
     end
   end
 end
diff --git a/test/rss/test_maker_atom_feed.rb b/test/rss/test_maker_atom_feed.rb
index 2ca67e719a..6ffd47c396 100644
--- a/test/rss/test_maker_atom_feed.rb
+++ b/test/rss/test_maker_atom_feed.rb
@@ -413,7 +413,7 @@ module RSS
         end
       end
       assert_equal(date, feed.items[0].updated.content)
-      assert_equal([date], feed.items[0].dc_dates.collect {|date| date.value})
+      assert_equal([date], feed.items[0].dc_dates.collect {|_date| _date.value})
     end
 
     def test_channel_dc_date
@@ -425,7 +425,7 @@ module RSS
         setup_dummy_item_atom(maker)
       end
       assert_equal(date, feed.updated.content)
-      assert_equal([date], feed.dc_dates.collect {|date| date.value})
+      assert_equal([date], feed.dc_dates.collect {|_date| _date.value})
     end
 
     def test_item_dc_date
@@ -439,7 +439,7 @@ module RSS
         end
       end
       assert_equal(date, feed.items[0].updated.content)
-      assert_equal([date], feed.items[0].dc_dates.collect {|date| date.value})
+      assert_equal([date], feed.items[0].dc_dates.collect {|_date| _date.value})
     end
   end
 end