merge stash a little faster

mojolicious · Feb 22, 2014 · 40b0d93 · 40b0d93
1 parent e4fb6f5
commit 40b0d93
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -110,8 +110,7 @@ sub handler {
   $stash->{'mojo.secrets'} //= $self->secrets;
 
   # Build default controller
-  my $defaults = $self->defaults;
-  @{$stash}{keys %$defaults} = values %$defaults;
+  %$stash = (%$stash, %{$self->defaults});
   my $c
     = $self->controller_class->new(app => $self, stash => $stash, tx => $tx);
   weaken $c->{$_} for qw(app tx);

diff --git a/lib/Mojolicious/Renderer.pm b/lib/Mojolicious/Renderer.pm
@@ -79,7 +79,7 @@ sub render {
     if my $partial = delete $args->{partial};
 
   # Merge stash and arguments
-  @{$stash}{keys %$args} = values %$args;
+  %$stash = (%$stash, %$args);
 
   my $options = {
     encoding => $self->encoding,

diff --git a/lib/Mojolicious/Routes.pm b/lib/Mojolicious/Routes.pm
@@ -33,9 +33,10 @@ sub continue {
   return $self->auto_render($c) unless my $field = $stack->[$current];
 
   # Merge captures into stash
-  my @keys  = keys %$field;
   my $stash = $c->stash;
-  @{$stash}{@keys} = @{$stash->{'mojo.captures'}}{@keys} = values %$field;
+  my $captures = $stash->{'mojo.captures'} //= {};
+  %$captures = (%$captures, %$field);
+  %$stash    = (%$stash,    %$field);
 
   my $continue;
   my $last = !$stack->[++$current];

diff --git a/lib/Mojolicious/Sessions.pm b/lib/Mojolicious/Sessions.pm
@@ -37,8 +37,7 @@ sub store {
 
   # Don't reset flash for static files
   my $old = delete $session->{flash};
-  @{$session->{new_flash}}{keys %$old} = values %$old
-    if $stash->{'mojo.static'};
+  $session->{new_flash} = $old if $stash->{'mojo.static'};
   delete $session->{new_flash} unless keys %{$session->{new_flash}};
 
   # Generate "expires" value from "expiration" if necessary