X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FMouse%2FUtil.pm;h=b51f7bc81f6ed7c00c124e0ab7e29e6bbff0033d;hb=refs%2Ftags%2F0.33;hp=f9f218188ee56dfc96e88131d679031f7f18e264;hpb=2e33bb59f4812cdb48fe068c11929c4e646405ab;p=gitmo%2FMouse.git

diff --git a/lib/Mouse/Util.pm b/lib/Mouse/Util.pm
index f9f2181..b51f7bc 100644
--- a/lib/Mouse/Util.pm
+++ b/lib/Mouse/Util.pm
@@ -2,6 +2,7 @@ package Mouse::Util;
 use strict;
 use warnings;
 use base qw/Exporter/;
+
 use Carp qw(confess);
 use B ();
 
@@ -27,16 +28,16 @@ our %EXPORT_TAGS = (
 # Moose::Util compatible utilities
 
 sub find_meta{
-    return Mouse::Module::class_of( $_[0] );
+    return Mouse::Meta::Module::class_of( $_[0] );
 }
 
 sub does_role{
-    my ($class_or_obj, $role) = @_;
-
-    my $meta = Mouse::Module::class_of($class_or_obj);
-
-    return 0 unless defined $meta;
-    return 1 if $meta->does_role($role);
+    my ($class_or_obj, $role) = @_;
+
+    my $meta = Mouse::Meta::Module::class_of($class_or_obj);
+
+    return 0 unless defined $meta;
+    return 1 if $meta->does_role($role);
     return 0;
 }
 
@@ -86,44 +87,44 @@ BEGIN {
 }
 
 { # taken from Sub::Identify
-    sub get_code_info($) {
-        my ($coderef) = @_;
-        ref($coderef) or return;
+    sub get_code_info($) {
+        my ($coderef) = @_;
+        ref($coderef) or return;
 
-        my $cv = B::svref_2object($coderef);
+        my $cv = B::svref_2object($coderef);
         $cv->isa('B::CV') or return;
 
-        my $gv = $cv->GV;
-        $gv->isa('B::GV') or return;
-
-        return ($gv->STASH->NAME, $gv->NAME);
-    }
+        my $gv = $cv->GV;
+        $gv->isa('B::GV') or return;
+
+        return ($gv->STASH->NAME, $gv->NAME);
+    }
 }
 
 # taken from Mouse::Util (0.90)
 {
     my %cache;
 
-    sub resolve_metaclass_alias {
-        my ( $type, $metaclass_name, %options ) = @_;
-
-        my $cache_key = $type . q{ } . ( $options{trait} ? '-Trait' : '' );
+    sub resolve_metaclass_alias {
+        my ( $type, $metaclass_name, %options ) = @_;
+
+        my $cache_key = $type . q{ } . ( $options{trait} ? '-Trait' : '' );
+
+        return $cache{$cache_key}{$metaclass_name} ||= do{
 
-        return $cache{$cache_key}{$metaclass_name} ||= do{
-
             my $possible_full_name = join '::',
                 'Mouse::Meta', $type, 'Custom', ($options{trait} ? 'Trait' : ()), $metaclass_name
             ;
 
-            my $loaded_class = load_first_existing_class(
-                $possible_full_name,
-                $metaclass_name
-            );
-
-            $loaded_class->can('register_implementation')
-                ? $loaded_class->register_implementation
+            my $loaded_class = load_first_existing_class(
+                $possible_full_name,
+                $metaclass_name
+            );
+
+            $loaded_class->can('register_implementation')
+                ? $loaded_class->register_implementation
                 : $loaded_class;
-        };
+        };
     }
 }
 
@@ -264,15 +265,15 @@ sub apply_all_roles {
 
 # taken from Moose::Util 0.90
 sub english_list {
-    return $_[0] if @_ == 1;
-
-    my @items = sort @_;
-
-    return "$items[0] and $items[1]" if @items == 2;
-
-    my $tail = pop @items;
-
-    return join q{, }, @items, "and $tail";
+    return $_[0] if @_ == 1;
+
+    my @items = sort @_;
+
+    return "$items[0] and $items[1]" if @items == 2;
+
+    my $tail = pop @items;
+
+    return join q{, }, @items, "and $tail";
 }
 
 sub not_supported{