X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMoose%2FMeta%2FRole%2FApplication%2FToClass.pm;h=488274ab44fb6ff72be9c116035640023559c60b;hb=3ee7b5ad664d6b70cb48914bda65cc5c9b905baa;hp=f7573ab6e62e76b6677c85d1c49a93c582e99d67;hpb=79886df7fe307692f03338b0ba21506e7471f28d;p=gitmo%2FMoose.git

diff --git a/lib/Moose/Meta/Role/Application/ToClass.pm b/lib/Moose/Meta/Role/Application/ToClass.pm
index f7573ab..488274a 100644
--- a/lib/Moose/Meta/Role/Application/ToClass.pm
+++ b/lib/Moose/Meta/Role/Application/ToClass.pm
@@ -7,7 +7,7 @@ use metaclass;
 use Moose::Util  'english_list';
 use Scalar::Util 'weaken', 'blessed';
 
-our $VERSION   = '0.79';
+our $VERSION   = '0.80';
 $VERSION = eval $VERSION;
 our $AUTHORITY = 'cpan:STEVAN';
 
@@ -73,7 +73,7 @@ sub check_required_methods {
 
     my $error = '';
 
-    my @conflicts = grep { $_->is_conflict } @missing;
+    my @conflicts = grep { $_->isa('Moose::Meta::Role::Method::Conflicting') } @missing;
 
     if (@conflicts) {
         my $conflict = $conflicts[0];
@@ -84,7 +84,7 @@ sub check_required_methods {
             .  $roles
             . ", the method '"
             . $conflict->name
-            . "' must be implemented by '"
+            . "' must be implemented or excluded by '"
             . $class->name
             . q{'};
     }