X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FBlockRunner.pm;h=4c5af9a23544913f5e57b34f4b1610c06597213f;hb=cbd7f87a859ccbb026af01fe38c832596323f156;hp=d65595cb0bdcb3c23461f1e0bb87d4a28a832678;hpb=7f9a3f70074c5d4eb4e8260648f055b7556a7a4f;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Storage/BlockRunner.pm b/lib/DBIx/Class/Storage/BlockRunner.pm
index d65595c..4c5af9a 100644
--- a/lib/DBIx/Class/Storage/BlockRunner.pm
+++ b/lib/DBIx/Class/Storage/BlockRunner.pm
@@ -4,23 +4,33 @@ package # hide from pause until we figure it all out
 use warnings;
 use strict;
 
+use DBIx::Class::Exception;
+use DBIx::Class::Carp;
+use Context::Preserve 'preserve_context';
+use DBIx::Class::_Util qw(is_exception qsub);
+use Scalar::Util qw(weaken blessed reftype);
+use Try::Tiny;
+
 # DO NOT edit away without talking to riba first, he will just put it back
 # BEGIN pre-Moo2 import block
 BEGIN {
   my $initial_fatal_bits = (${^WARNING_BITS}||'') & $warnings::DeadBits{all};
+
   local $ENV{PERL_STRICTURES_EXTRA} = 0;
-  require Moo; Moo->import;
+  # load all of these now, so that lazy-loading does not escape
+  # the current PERL_STRICTURES_EXTRA setting
+  require Sub::Quote;
+  require Sub::Defer;
+  require Moo;
+  require Moo::Object;
+  require Method::Generate::Accessor;
+  require Method::Generate::Constructor;
+
+  Moo->import;
   ${^WARNING_BITS} &= ( $initial_fatal_bits | ~ $warnings::DeadBits{all} );
 }
 # END pre-Moo2 import block
 
-use DBIx::Class::Exception;
-use DBIx::Class::Carp;
-use Context::Preserve 'preserve_context';
-use DBIx::Class::_Util qw(is_exception qsub);
-use Scalar::Util qw(weaken blessed reftype);
-use Try::Tiny;
-
 use namespace::clean;
 
 =head1 NAME