stop using old Class::MOP functions

7 files changed, 17 insertions, 15 deletions

diff --git a/lib/MooseX/NonMoose.pm b/lib/MooseX/NonMoose.pm
index cd57406..d369236 100644
--- a/lib/MooseX/NonMoose.pm
+++ b/lib/MooseX/NonMoose.pm
@@ -84,7 +84,7 @@ my ($import, $unimport, $init_meta) = Moose::Exporter->build_import_methods(
 sub init_meta {
     my $package = shift;
     my %options = @_;
-    my $meta = Class::MOP::class_of($options{for_class});
+    my $meta = Moose::Util::find_meta($options{for_class});
     Carp::cluck('Roles have no use for MooseX::NonMoose')
         if $meta && $meta->isa('Moose::Meta::Role');
     $package->$init_meta(@_);
diff --git a/lib/MooseX/NonMoose/InsideOut.pm b/lib/MooseX/NonMoose/InsideOut.pm
index 8d19bc3..d35a87d 100644
--- a/lib/MooseX/NonMoose/InsideOut.pm
+++ b/lib/MooseX/NonMoose/InsideOut.pm
@@ -45,7 +45,7 @@ my ($import, $unimport, $init_meta) = Moose::Exporter->build_import_methods(
 sub init_meta {
     my $package = shift;
     my %options = @_;
-    my $meta = Class::MOP::class_of($options{for_class});
+    my $meta = Moose::Util::find_meta($options{for_class});
     Carp::cluck('Roles have no use for MooseX::NonMoose')
         if $meta && $meta->isa('Moose::Meta::Role');
     $package->$init_meta(@_);
diff --git a/lib/MooseX/NonMoose/Meta/Role/Class.pm b/lib/MooseX/NonMoose/Meta/Role/Class.pm
index e873877..9e30c3c 100644
--- a/lib/MooseX/NonMoose/Meta/Role/Class.pm
+++ b/lib/MooseX/NonMoose/Meta/Role/Class.pm
@@ -1,8 +1,10 @@
 package MooseX::NonMoose::Meta::Role::Class;
 use Moose::Role;
-use List::MoreUtils qw(any);
 # ABSTRACT: metaclass trait for L<MooseX::NonMoose>
 
+use List::MoreUtils qw(any);
+use Module::Runtime qw(use_package_optimistically);
+
 =head1 SYNOPSIS
 
   package Foo;
@@ -23,7 +25,7 @@ use List::MoreUtils qw(any);
           for_class       => $options{for_class},
           metaclass_roles => ['MooseX::NonMoose::Meta::Role::Class'],
       );
-      return Class::MOP::class_of($options{for_class});
+      return Moose::Util::find_meta($options{for_class});
   }
 
 =head1 DESCRIPTION
@@ -60,7 +62,7 @@ around reinitialize => sub {
     my $class = shift;
     my ($pkg) = @_;
 
-    my $meta = blessed($pkg) ? $pkg : Class::MOP::class_of($pkg);
+    my $meta = blessed($pkg) ? $pkg : Moose::Util::find_meta($pkg);
 
     $class->$orig(
         @_,
@@ -79,7 +81,7 @@ sub _determine_constructor_options {
 
     # if we're using just the metaclass trait, but not the constructor trait,
     # then suppress the warning about not inlining a constructor
-    my $cc_meta = Class::MOP::class_of($self->constructor_class);
+    my $cc_meta = Moose::Util::find_meta($self->constructor_class);
     return (@options, inline_constructor => 0)
         unless $cc_meta->can('does_role')
             && $cc_meta->does_role('MooseX::NonMoose::Meta::Role::Constructor');
@@ -271,10 +273,10 @@ around superclasses => sub {
             );
         }
 
-        Class::MOP::load_class($name, $opts);
+        use_package_optimistically($name, $opts ? $opts->{-version} : ());
 
         if (defined($cur_constructor_name)) {
-            my $meta = Class::MOP::class_of($name);
+            my $meta = Moose::Util::find_meta($name);
             $self->throw_error(
                 "You specified '$cur_constructor_name' as the constructor for "
               . "$name, but $name has no method by that name"
diff --git a/lib/MooseX/NonMoose/Meta/Role/Constructor.pm b/lib/MooseX/NonMoose/Meta/Role/Constructor.pm
index 1082b09..3204668 100644
--- a/lib/MooseX/NonMoose/Meta/Role/Constructor.pm
+++ b/lib/MooseX/NonMoose/Meta/Role/Constructor.pm
@@ -19,7 +19,7 @@ use Moose::Role 2.0000;
           constructor_class_roles =>
               ['MooseX::NonMoose::Meta::Role::Constructor'],
       );
-      return Class::MOP::class_of($options{for_class});
+      return Moose::Util::find_meta($options{for_class});
   }
 
 =head1 DESCRIPTION
@@ -38,8 +38,8 @@ around can_be_inlined => sub {
     my $meta = $self->associated_metaclass;
     my $super_new = $meta->find_method_by_name($self->name);
     my $super_meta = $super_new->associated_metaclass;
-    if (Class::MOP::class_of($super_meta)->can('does_role')
-     && Class::MOP::class_of($super_meta)->does_role('MooseX::NonMoose::Meta::Role::Class')) {
+    if (Moose::Util::find_meta($super_meta)->can('does_role')
+     && Moose::Util::find_meta($super_meta)->does_role('MooseX::NonMoose::Meta::Role::Class')) {
         return 1;
     }
 
diff --git a/t/moose-exporter.t b/t/moose-exporter.t
index 13b556d..b76113b 100644
--- a/t/moose-exporter.t
+++ b/t/moose-exporter.t
@@ -20,7 +20,7 @@ BEGIN {
                 class => ['MooseX::NonMoose::Meta::Role::Class'],
             },
         );
-        return Class::MOP::class_of($options{for_class});
+        return Moose::Util::find_meta($options{for_class});
     }
 
     package Foo::Exporter::ClassAndConstructor;
@@ -39,7 +39,7 @@ BEGIN {
                     ['MooseX::NonMoose::Meta::Role::Constructor'],
             },
         );
-        return Class::MOP::class_of($options{for_class});
+        return Moose::Util::find_meta($options{for_class});
     }
 
 }
diff --git a/t/moosex-globref.t b/t/moosex-globref.t
index 60bfa9c..e33c204 100644
--- a/t/moosex-globref.t
+++ b/t/moosex-globref.t
@@ -33,7 +33,7 @@ BEGIN {
                     ['MooseX::GlobRef::Role::Meta::Instance'],
             },
         );
-        return Class::MOP::class_of($options{for_class});
+        return Moose::Util::find_meta($options{for_class});
     }
 }
 
diff --git a/t/moosex-insideout.t b/t/moosex-insideout.t
index fcd3fd1..dd080f4 100644
--- a/t/moosex-insideout.t
+++ b/t/moosex-insideout.t
@@ -29,7 +29,7 @@ BEGIN {
                     ['MooseX::InsideOut::Role::Meta::Instance'],
             },
         );
-        return Class::MOP::class_of($options{for_class});
+        return Moose::Util::find_meta($options{for_class});
     }
 }