diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-29 16:13:29 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-05-29 16:13:29 -0700 |
commit | 74b73f132aab596ce509082fdf2b0e9dd4226e9c (patch) | |
tree | 821733b6379d00555a7c3e21e9c546bf4f9a958d /actionpack/lib/action_dispatch/routing | |
parent | be137b0ac389c5bed93df4b5a76e19549b8e1cfa (diff) | |
download | rails-74b73f132aab596ce509082fdf2b0e9dd4226e9c.tar.gz rails-74b73f132aab596ce509082fdf2b0e9dd4226e9c.tar.bz2 rails-74b73f132aab596ce509082fdf2b0e9dd4226e9c.zip |
Mapping never actually uses @set, so rm
Diffstat (limited to 'actionpack/lib/action_dispatch/routing')
-rw-r--r-- | actionpack/lib/action_dispatch/routing/mapper.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index e4fd63cf0e..3bc578b379 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -66,8 +66,8 @@ module ActionDispatch attr_reader :scope, :options, :requirements, :conditions, :defaults attr_reader :to, :default_controller, :default_action - def initialize(set, scope, path, options) - @set, @scope = set, scope + def initialize(scope, path, options) + @scope = scope @requirements, @conditions, @defaults = {}, {}, {} options = scope[:options].merge(options) if scope[:options] @@ -1515,7 +1515,7 @@ module ActionDispatch options[:as] = name_for_action(options[:as], action) end - mapping = Mapping.new(@set, @scope, URI.parser.escape(path), options) + mapping = Mapping.new(@scope, URI.parser.escape(path), options) app, conditions, requirements, defaults, as, anchor = mapping.to_route @set.add_route(app, conditions, requirements, defaults, as, anchor) end |