Silence some trivial warnings: shadowed local vars, indentation mismatches

1 files changed, 59 insertions, 60 deletions

diff --git a/actionpack/lib/action_controller/metal/flash.rb b/actionpack/lib/action_controller/metal/flash.rb
index 581ff6109e..682f90e23b 100644
--- a/actionpack/lib/action_controller/metal/flash.rb
+++ b/actionpack/lib/action_controller/metal/flash.rb
@@ -123,80 +123,79 @@ module ActionController #:nodoc:
         session["flash"] = self
       end
 
-    private
-      # Used internally by the <tt>keep</tt> and <tt>discard</tt> methods
-      #     use()               # marks the entire flash as used
-      #     use('msg')          # marks the "msg" entry as used
-      #     use(nil, false)     # marks the entire flash as unused (keeps it around for one more action)
-      #     use('msg', false)   # marks the "msg" entry as unused (keeps it around for one more action)
-      # Returns the single value for the key you asked to be marked (un)used or the FlashHash itself
-      # if no key is passed.
-      def use(key = nil, used = true)
-        Array(key || keys).each { |k| used ? @used << k : @used.delete(k) }
-        return key ? self[key] : self
-      end
-  end
-
-  # Access the contents of the flash. Use <tt>flash["notice"]</tt> to
-  # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
-  # to put a new one.
-  def flash #:doc:
-    unless @_flash
-      @_flash = session["flash"] || FlashHash.new
-      @_flash.sweep
+      private
+        # Used internally by the <tt>keep</tt> and <tt>discard</tt> methods
+        #     use()               # marks the entire flash as used
+        #     use('msg')          # marks the "msg" entry as used
+        #     use(nil, false)     # marks the entire flash as unused (keeps it around for one more action)
+        #     use('msg', false)   # marks the "msg" entry as unused (keeps it around for one more action)
+        # Returns the single value for the key you asked to be marked (un)used or the FlashHash itself
+        # if no key is passed.
+        def use(key = nil, used = true)
+          Array(key || keys).each { |k| used ? @used << k : @used.delete(k) }
+          return key ? self[key] : self
+        end
     end
 
-    @_flash
-  end
-
-  # Convenience accessor for flash[:alert]
-  def alert
-    flash[:alert]
-  end
-
-  # Convenience accessor for flash[:alert]=
-  def alert=(message)
-    flash[:alert] = message
-  end
+    # Access the contents of the flash. Use <tt>flash["notice"]</tt> to
+    # read a notice you put there or <tt>flash["notice"] = "hello"</tt>
+    # to put a new one.
+    def flash #:doc:
+      unless @_flash
+        @_flash = session["flash"] || FlashHash.new
+        @_flash.sweep
+      end
 
-  # Convenience accessor for flash[:notice]
-  def notice
-    flash[:notice]
-  end
+      @_flash
+    end
 
-  # Convenience accessor for flash[:notice]=
-  def notice=(message)
-    flash[:notice] = message
-  end
+    # Convenience accessor for flash[:alert]
+    def alert
+      flash[:alert]
+    end
 
+    # Convenience accessor for flash[:alert]=
+    def alert=(message)
+      flash[:alert] = message
+    end
 
-  protected
-    def process_action(method_name)
-      @_flash = nil
-      super
-      @_flash.store(session) if @_flash
-      @_flash = nil
+    # Convenience accessor for flash[:notice]
+    def notice
+      flash[:notice]
     end
 
-    def reset_session
-      super
-      @_flash = nil
+    # Convenience accessor for flash[:notice]=
+    def notice=(message)
+      flash[:notice] = message
     end
 
-    def redirect_to(options = {}, response_status_and_flash = {}) #:doc:
-      if alert = response_status_and_flash.delete(:alert)
-        flash[:alert] = alert
+    protected
+      def process_action(method_name)
+        @_flash = nil
+        super
+        @_flash.store(session) if @_flash
+        @_flash = nil
       end
 
-      if notice = response_status_and_flash.delete(:notice)
-        flash[:notice] = notice
+      def reset_session
+        super
+        @_flash = nil
       end
 
-      if other_flashes = response_status_and_flash.delete(:flash)
-        flash.update(other_flashes)
-      end
+      def redirect_to(options = {}, response_status_and_flash = {}) #:doc:
+        if alert = response_status_and_flash.delete(:alert)
+          flash[:alert] = alert
+        end
 
-      super(options, response_status_and_flash)
-    end
+        if notice = response_status_and_flash.delete(:notice)
+          flash[:notice] = notice
+        end
+
+        if other_flashes = response_status_and_flash.delete(:flash)
+          flash.update(other_flashes)
+        end
+
+        super(options, response_status_and_flash)
+      end
   end
 end