no more smartmatch

mojolicious · Feb 7, 2013 · 0cc36c0 · 0cc36c0
1 parent eff7e8d
commit 0cc36c0
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/Mojo/Collection.pm b/lib/Mojo/Collection.pm
@@ -28,12 +28,15 @@ sub each {
 
 sub first {
   my ($self, $cb) = @_;
-  return $cb ? List::Util::first { $_ ~~ $cb } @$self : $self->[0];
+  return $self->[0] unless $cb;
+  return List::Util::first { $cb->($_) } @$self if ref $cb eq 'CODE';
+  return List::Util::first { $_ =~ $cb } @$self;
 }
 
 sub grep {
   my ($self, $cb) = @_;
-  return $self->new(grep { $_ ~~ $cb } @$self);
+  return $self->new(grep { $cb->($_) } @$self) if ref $cb eq 'CODE';
+  return $self->new(grep { $_ =~ $cb } @$self);
 }
 
 sub join {