stop using excludes within moose, since it's no longer necessary

[gitmo/Moose.git] / lib / Moose / Meta / Method / Accessor / Native / Hash / delete.pm

diff --git a/lib/Moose/Meta/Method/Accessor/Native/Hash/delete.pm b/lib/Moose/Meta/Method/Accessor/Native/Hash/delete.pm
index 54af8f5..e471a0a 100644 (file)
--- a/lib/Moose/Meta/Method/Accessor/Native/Hash/delete.pm
+++ b/lib/Moose/Meta/Method/Accessor/Native/Hash/delete.pm
@@ -3,39 +3,35 @@ package Moose::Meta::Method::Accessor::Native::Hash::delete;
 use strict;
 use warnings;
 
-our $VERSION = '1.16';
-$VERSION = eval $VERSION;
-our $AUTHORITY = 'cpan:STEVAN';
-
 use Moose::Role;
 
-with 'Moose::Meta::Method::Accessor::Native::Hash::Writer' => {
-    -excludes => [
-        qw(
-            _inline_optimized_set_new_value
-            _return_value
-            )
-    ],
-};
+with 'Moose::Meta::Method::Accessor::Native::Hash::Writer';
 
 sub _adds_members { 0 }
 
 sub _potential_value {
-    my ( $self, $slot_access ) = @_;
-
-    return "( do { my \%potential = %{ $slot_access }; \@return = delete \@potential{\@_}; \\\%potential; } )";
+    my $self = shift;
+    my ($slot_access) = @_;
+
+    return '(do { '
+             . 'my %potential = %{ (' . $slot_access . ') }; '
+             . '@return = delete @potential{@_}; '
+             . '\%potential; '
+         . '})';
 }
 
 sub _inline_optimized_set_new_value {
-    my ( $self, $inv, $new, $slot_access ) = @_;
+    my $self = shift;
+    my ($inv, $new, $slot_access) = @_;
 
-    return "\@return = delete \@{ $slot_access }{\@_}";
+    return '@return = delete @{ (' . $slot_access . ') }{@_};';
 }
 
 sub _return_value {
-    my ( $self, $slot_access ) = @_;
+    my $self = shift;
+    my ($slot_access) = @_;
 
-    return 'return wantarray ? @return : $return[-1];';
+    return 'wantarray ? @return : $return[-1]';
 }
 
 no Moose::Role;