remove remnants of Class::MOP

jonswar · Jul 11, 2013 · 01b3cec · 01b3cec
1 parent 4017da4
commit 01b3cec
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/etc/bench/bench.pl b/etc/bench/bench.pl
@@ -18,6 +18,7 @@
 use Text::Table;
 use Try::Tiny;
 use YAML::Any qw(DumpFile);
+use Module::Runtime qw(require_module);
 use warnings;
 use strict;
 
@@ -66,7 +67,7 @@ sub usage {
 foreach my $name ( grep { /$drivers_pattern/ } keys(%cache_generators) ) {
     try {
         if ( my $req = $cache_generators{$name}->{req} ) {
-            Class::MOP::load_class($_) foreach @$req;
+            require_module($_) foreach @$req;
         }
         $caches{$name} = $cache_generators{$name}->{code}->();
     }

diff --git a/lib/CHI/Test.pm b/lib/CHI/Test.pm
@@ -3,7 +3,7 @@
 package CHI::Test;
 use Log::Any::Test;    # as early as possible
 use List::MoreUtils qw(uniq);
-use Class::MOP;
+use Module::Runtime qw(require_module);
 use CHI;
 use CHI::Driver::Memory;
 use strict;
@@ -29,7 +29,7 @@ sub export_to_level {
     my ( $class, $level, $ignore ) = @_;
 
     foreach my $package ( $class->packages_to_import() ) {
-        Class::MOP::load_class($package);
+        require_module($package);
         my @export;
         if ( $package eq 'Test::Deep' ) {
 

diff --git a/lib/CHI/t/Driver.pm b/lib/CHI/t/Driver.pm
@@ -1701,7 +1701,10 @@ sub test_no_leak : Tests {
     ok( !defined($weakref), "weakref is no longer defined - cache was freed" );
 }
 
-Class::MOP::Class->create( 'My::CHI' => ( superclasses => ['CHI'] ) );
+{
+  package My::CHI;
+  our @ISA = qw(CHI);
+}
 
 sub test_driver_properties : Tests {
     my $self  = shift;