Stop using deprecated CMOP APIs

diff --git a/lib/Catalyst/Controller.pm b/lib/Catalyst/Controller.pm
index bb4ce8b..cea7234 100644 (file)
--- a/lib/Catalyst/Controller.pm
+++ b/lib/Catalyst/Controller.pm
@@ -2,6 +2,7 @@ package Catalyst::Controller;
 
 use Moose;
 use Class::MOP;
+use Class::Load ':all';
 use String::RewritePrefix;
 use Moose::Util qw/find_meta/;
 use List::Util qw/first/;
@@ -83,7 +84,7 @@ sub BUILD {
 sub _build__action_roles {
     my $self = shift;
     my @roles = $self->_expand_role_shortname($self->_action_role_args);
-    Class::MOP::load_class($_) for @roles;
+    load_class($_) for @roles;
     return \@roles;
 }
 
@@ -297,7 +298,7 @@ sub register_action_methods {
 sub _apply_action_class_roles {
     my ($self, $class, @roles) = @_;
 
-    Class::MOP::load_class($_) for @roles;
+    load_class($_) for @roles;
     my $meta = Moose::Meta::Class->initialize($class)->create_anon_class(
         superclasses => [$class],
         roles        => \@roles,
@@ -537,7 +538,7 @@ sub _expand_role_shortname {
 
     return String::RewritePrefix->rewrite(
         { ''  => sub {
-            my $loaded = Class::MOP::load_first_existing_class(
+            my $loaded = load_first_existing_class(
                 map { "$_$_[0]" } @prefixes
             );
             return first { $loaded =~ /^$_/ }