[Catalyst-commits] r13198 - Catalyst-Runtime/5.80/trunk/lib

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2010-05-03 01:51:43 +0100 (Mon, 03 May 2010)
New Revision: 13198

Modified:
   Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
Log:
Remove useless conditional.

Modified: Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm
===================================================================
--- Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2010-05-02 23:46:42 UTC (rev 13197)
+++ Catalyst-Runtime/5.80/trunk/lib/Catalyst.pm	2010-05-03 00:51:43 UTC (rev 13198)
@@ -2811,8 +2811,8 @@
          } @{ $plugins };
 
         for my $plugin ( reverse @plugins ) {
+            # pass along $plugin->[1] as well once cmop supports it
             Class::MOP::load_class($plugin->[0]);
-            # pass along $plugin->[1] as well once cmop supports it
             my $meta = find_meta($plugin->[0]);
             next if $meta && $meta->isa('Moose::Meta::Role');
 
@@ -2820,9 +2820,9 @@
         }
 
         my @roles =
-            map { $_->[0]->name, $_->[1] }
-            grep { $_->[0] && blessed($_->[0]) && $_->[0]->isa('Moose::Meta::Role') }
-            map { [find_meta($_->[0]), $_->[1]] }
+            map  { $_->[0]->name, $_->[1] }
+            grep { blessed($_->[0]) && $_->[0]->isa('Moose::Meta::Role') }
+            map  { [find_meta($_->[0]), $_->[1]] }
             @plugins;
 
         Moose::Util::apply_all_roles(