diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-28 16:28:26 -0800 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-12-28 17:36:08 -0800 |
commit | 9a650a6547d2a83004db1bf913e26a8daa1c0b6e (patch) | |
tree | 28ba954aa7ea327187e30b98faf044bf9cfbf201 /actionpack/lib/action_dispatch | |
parent | 6d390671f639b3314437054df0d393cef10493bd (diff) | |
download | rails-9a650a6547d2a83004db1bf913e26a8daa1c0b6e.tar.gz rails-9a650a6547d2a83004db1bf913e26a8daa1c0b6e.tar.bz2 rails-9a650a6547d2a83004db1bf913e26a8daa1c0b6e.zip |
Silence some trivial warnings: shadowed local vars, indentation mismatches
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r-- | actionpack/lib/action_dispatch/http/headers.rb | 14 | ||||
-rw-r--r-- | actionpack/lib/action_dispatch/http/mime_type.rb | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/actionpack/lib/action_dispatch/http/headers.rb b/actionpack/lib/action_dispatch/http/headers.rb index 2a41b4dbad..1e43104f0a 100644 --- a/actionpack/lib/action_dispatch/http/headers.rb +++ b/actionpack/lib/action_dispatch/http/headers.rb @@ -6,13 +6,13 @@ module ActionDispatch extend ActiveSupport::Memoizable def initialize(*args) - if args.size == 1 && args[0].is_a?(Hash) - super() - update(args[0]) - else - super - end - end + if args.size == 1 && args[0].is_a?(Hash) + super() + update(args[0]) + else + super + end + end def [](header_name) if include?(header_name) diff --git a/actionpack/lib/action_dispatch/http/mime_type.rb b/actionpack/lib/action_dispatch/http/mime_type.rb index c30897b32a..e681b6340d 100644 --- a/actionpack/lib/action_dispatch/http/mime_type.rb +++ b/actionpack/lib/action_dispatch/http/mime_type.rb @@ -104,7 +104,7 @@ module Mime SET << Mime.const_get(symbol.to_s.upcase) - ([string] + mime_type_synonyms).each { |string| LOOKUP[string] = SET.last } unless skip_lookup + ([string] + mime_type_synonyms).each { |str| LOOKUP[str] = SET.last } unless skip_lookup ([symbol.to_s] + extension_synonyms).each { |ext| EXTENSION_LOOKUP[ext] = SET.last } end |