Ensure RDoc::Task exists even if 'rdoc/task' was not required

Rakefile

@@ -1,11 +1,6 @@
 #!/usr/bin/env rake
 
-
-begin
-  require 'rdoc/task'
-rescue LoadError
-  require 'rake/rdoctask'
-end
+require 'rdoc/task'
 require 'net/http'
 
 $:.unshift File.expand_path('..', __FILE__)

railties/lib/rails/generators/rails/plugin_new/templates/Rakefile

@@ -7,7 +7,9 @@ end
 begin
   require 'rdoc/task'
 rescue LoadError
+  require 'rdoc/rdoc'
   require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
 end
 
 RDoc::Task.new(:rdoc) do |rdoc|

railties/lib/rails/tasks/documentation.rake

@@ -1,7 +1,9 @@
 begin
   require 'rdoc/task'
 rescue LoadError
+  require 'rdoc/rdoc'
   require 'rake/rdoctask'
+  RDoc::Task = Rake::RDocTask
 end
 
 # Monkey-patch to remove redoc'ing and clobber descriptions to cut down on rake -T noise

railties/test/railties/railtie_test.rb

@@ -97,12 +97,7 @@ module RailtiesTest
       assert !$ran_block
       require 'rake'
       require 'rake/testtask'
-      begin
-        require 'rdoc/task'
-      rescue LoadError
-        require 'rake/rdoctask'
-      end
-
+      require 'rdoc/task'
 
       AppTemplate::Application.load_tasks
       assert $ran_block

railties/test/railties/shared_tests.rb

@@ -237,11 +237,7 @@ module RailtiesTest
 
       boot_rails
       require 'rake'
-      begin
-        require 'rdoc/task'
-      rescue LoadError
-        require 'rake/rdoctask'
-      end
+      require 'rdoc/task'
       require 'rake/testtask'
       Rails.application.load_tasks
       Rake::Task[:foo].invoke