finish role tc test

diff --git a/lib/Moose/Meta/TypeConstraint/Role.pm b/lib/Moose/Meta/TypeConstraint/Role.pm
index c2bf664..d92e718 100644 (file)
--- a/lib/Moose/Meta/TypeConstraint/Role.pm
+++ b/lib/Moose/Meta/TypeConstraint/Role.pm
@@ -19,7 +19,7 @@ __PACKAGE__->meta->add_attribute('role' => (
 sub new {
     my ( $class, %args ) = @_;
 
-    $args{parent} = Moose::Util::TypeConstraints::find_type_constraint('Object');
+    $args{parent} = Moose::Util::TypeConstraints::find_type_constraint('Role');
     my $self      = $class->meta->new_object(%args);
 
     $self->_create_hand_optimized_type_constraint;
@@ -76,7 +76,7 @@ sub is_subtype_of {
 
     if ( not ref $type_or_name_or_role ) {
         # it might be a role
-        return 1 if $self->role->does_role( $type_or_name_or_role );
+        return 1 if $self->role->meta->does_role( $type_or_name_or_role );
     }
 
     my $type = Moose::Util::TypeConstraints::find_type_constraint($type_or_name_or_role);
@@ -84,7 +84,7 @@ sub is_subtype_of {
     if ( $type->isa(__PACKAGE__) ) {
         # if $type_or_name_or_role isn't a role, it might be the TC name of another ::Role type
         # or it could also just be a type object in this branch
-        return $self->role->does_role( $type->role );
+        return $self->role->meta->does_role( $type->role );
     } else {
         # the only other thing we are a subtype of is Object
         $self->SUPER::is_subtype_of($type);

diff --git a/lib/Moose/Role.pm b/lib/Moose/Role.pm
index 67347a3..6908b76 100644 (file)
--- a/lib/Moose/Role.pm
+++ b/lib/Moose/Role.pm
@@ -29,11 +29,7 @@ use Moose::Util::TypeConstraints;
         return $METAS{$role} if exists $METAS{$role};
 
         # make a subtype for each Moose class
-        subtype $role
-            => as 'Role'
-            => where { Moose::Util::does_role($_, $role) }
-            => optimize_as { blessed($_[0]) && Moose::Util::does_role($_[0], $role) }
-        unless find_type_constraint($role);
+        role_type $role unless find_type_constraint($role);
 
         my $meta;
         if ($role->can('meta')) {