Make Mouse::Util::load_class return the argument class name, which can remove several...

[gitmo/Mouse.git] / lib / Mouse / Util.pm

diff --git a/lib/Mouse/Util.pm b/lib/Mouse/Util.pm
index f2d4457..cd6297a 100644 (file)
--- a/lib/Mouse/Util.pm
+++ b/lib/Mouse/Util.pm
@@ -38,7 +38,7 @@ BEGIN{
     # Because Mouse::Util is loaded first in all the Mouse sub-modules,
     # XS loader is placed here, not in Mouse.pm.
 
-    our $VERSION = '0.50';
+    our $VERSION = '0.50_03';
 
     my $xs = !(exists $INC{'Mouse/PurePerl.pm'} || $ENV{MOUSE_PUREPERL});
 
@@ -244,12 +244,12 @@ sub _try_load_one_class {
 
     return undef if $is_class_loaded_cache{$class} ||= is_class_loaded($class);
 
-    my $file = $class . '.pm';
-    $file =~ s{::}{/}g;
+    $class  =~ s{::}{/}g;
+    $class .= '.pm';
 
     return do {
         local $@;
-        eval { require($file) };
+        eval { require $class };
         $@;
     };
 }
@@ -260,7 +260,7 @@ sub load_class {
     my $e = _try_load_one_class($class);
     Carp::confess "Could not load class ($class) because : $e" if $e;
 
-    return 1;
+    return $class;
 }
 
 sub is_class_loaded;
@@ -311,15 +311,7 @@ sub english_list {
 }
 
 sub quoted_english_list {
-    return qq{'$_[0]'} if @_ == 1;
-
-    my @items = sort @_;
-
-    return qq{'$items[0]' and '$items[1]'} if @items == 2;
-
-    my $tail = pop @items;
-
-    return join q{, }, (map{ qq{'$_'} } @items), qq{and '$tail'};
+    return english_list(map { qq{'$_'} } @_);
 }
 
 # common utilities
@@ -363,7 +355,7 @@ Mouse::Util - Features, with or without their dependencies
 
 =head1 VERSION
 
-This document describes Mouse version 0.50
+This document describes Mouse version 0.50_03
 
 =head1 IMPLEMENTATIONS FOR