Clean up warnings

[gitmo/Mouse.git] / lib / Mouse / Meta / Attribute.pm

diff --git a/lib/Mouse/Meta/Attribute.pm b/lib/Mouse/Meta/Attribute.pm
index 6a89774..a66fb32 100644 (file)
--- a/lib/Mouse/Meta/Attribute.pm
+++ b/lib/Mouse/Meta/Attribute.pm
@@ -77,7 +77,9 @@ sub new {
     # (3) bad options found
     if(@bad){
         @bad = sort @bad;
-        Carp::cluck("Found unknown argument(s) passed to '$name' attribute constructor in '$class': @bad");
+        local $Carp::Internal{'Mouse'}              = 1;
+        local $Carp::Internal{'Mouse::Meta::Class'} = 1;
+        Carp::carp("Found unknown argument(s) passed to '$name' attribute constructor in '$class': @bad");
     }
 
     my $self = bless $args, $class;
@@ -372,13 +374,8 @@ sub _canonicalize_handles {
 
 sub _make_delegation_method {
     my($self, $handle, $method_to_call) = @_;
-    my $delegator = $self->delegation_metaclass;
-    Mouse::Util::load_class($delegator);
-
-    return $delegator->_generate_delegation($self, $handle,
-        ref($method_to_call) eq 'ARRAY'
-            ? @{$method_to_call}
-            :   $method_to_call);
+    return Mouse::Util::load_class($self->delegation_metaclass)
+        ->_generate_delegation($self, $handle, $method_to_call);
 }
 
 sub throw_error{
@@ -397,7 +394,7 @@ Mouse::Meta::Attribute - The Mouse attribute metaclass
 
 =head1 VERSION
 
-This document describes Mouse version 0.50_01
+This document describes Mouse version 0.50_03
 
 =head1 METHODS